From 0ac39dd412356912876d6b7fa7d556244fbc65dd Mon Sep 17 00:00:00 2001 From: Douglas Parsons Date: Fri, 2 Jun 2023 14:13:09 +0100 Subject: [PATCH 1/2] Update example to latest runtime --- Cargo.lock | 50 +------------------------------------- examples/nextjs/Cargo.toml | 4 +-- 2 files changed, 3 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e6649ff..0ee44e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -831,7 +831,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", - "vercel_runtime 0.3.4", + "vercel_runtime 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1673,29 +1673,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "vercel_runtime" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "253a4515eff6ab36c5e21c6ac1a575daaecd8b9ccc1db1555df13902491c40c5" -dependencies = [ - "async-trait", - "base64 0.21.0", - "bytes", - "lambda_http", - "lambda_runtime", - "serde", - "serde_derive", - "serde_json", - "tokio", - "tower-http", - "tower-service", - "tracing", - "tracing-subscriber", - "vercel_runtime_macro 0.3.4", - "vercel_runtime_router 0.3.4", -] - [[package]] name = "vercel_runtime" version = "1.0.0" @@ -1740,18 +1717,6 @@ dependencies = [ "vercel_runtime_router 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "vercel_runtime_macro" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9da25a605882bd945e8b4d58e90c4d24fcc0484c7821d82a9cda75c8de6fcf6f" -dependencies = [ - "glob", - "quote", - "syn", - "vercel_runtime_router 0.3.4", -] - [[package]] name = "vercel_runtime_macro" version = "1.0.0" @@ -1774,19 +1739,6 @@ dependencies = [ "vercel_runtime_router 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "vercel_runtime_router" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e6954a9cff6b574807a036d53f0afc6de16e8a9797db321992847788082bbe" -dependencies = [ - "glob", - "lazy_static", - "quote", - "regex", - "syn", -] - [[package]] name = "vercel_runtime_router" version = "1.0.0" diff --git a/examples/nextjs/Cargo.toml b/examples/nextjs/Cargo.toml index 57f1abb..f75faca 100644 --- a/examples/nextjs/Cargo.toml +++ b/examples/nextjs/Cargo.toml @@ -13,8 +13,8 @@ serde_json = { version = "1.0.86", features = ["raw_value"] } serde_derive = "1.0.9" rand = "0.8.5" oorandom = "11.1.3" -# vercel_runtime = { version = "0.3.4", path = "../../crates/vercel_runtime" } -vercel_runtime = "0.3.4" +# vercel_runtime = { version = "1.0.0", path = "../../crates/vercel_runtime" } +vercel_runtime = "1.0.0" [[bin]] name = "rust" From 9dd2a4a2f10acb1e5526200e12e1d15cb74b0877 Mon Sep 17 00:00:00 2001 From: Douglas Parsons Date: Fri, 2 Jun 2023 14:29:13 +0100 Subject: [PATCH 2/2] Playing around --- Cargo.lock | 4 ++-- crates/vercel_runtime/Cargo.toml | 4 ++-- crates/vercel_runtime_macro/src/lib.rs | 5 ++++- examples/route-merge/Cargo.toml | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ee44e9..bc7886b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -798,7 +798,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "vercel_runtime 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "vercel_runtime 1.0.0", ] [[package]] @@ -1690,7 +1690,7 @@ dependencies = [ "tower-service", "tracing", "tracing-subscriber", - "vercel_runtime_macro 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "vercel_runtime_macro 1.0.0", "vercel_runtime_router 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/crates/vercel_runtime/Cargo.toml b/crates/vercel_runtime/Cargo.toml index 30a58f0..f583b30 100644 --- a/crates/vercel_runtime/Cargo.toml +++ b/crates/vercel_runtime/Cargo.toml @@ -32,6 +32,6 @@ base64 = "0.21.0" bytes = "1.4.0" async-trait = "0.1.66" # vercel_runtime_router = { version = "1.0.0", path = "../vercel_runtime_router" } -# vercel_runtime_macro = { version = "1.0.0", path = "../vercel_runtime_macro" } +vercel_runtime_macro = { version = "1.0.0", path = "../vercel_runtime_macro" } vercel_runtime_router = "1.0.0" -vercel_runtime_macro = "1.0.0" +# vercel_runtime_macro = "1.0.0" diff --git a/crates/vercel_runtime_macro/src/lib.rs b/crates/vercel_runtime_macro/src/lib.rs index 06fa53e..3b869cd 100644 --- a/crates/vercel_runtime_macro/src/lib.rs +++ b/crates/vercel_runtime_macro/src/lib.rs @@ -106,7 +106,10 @@ pub fn bundled_api(args: TokenStream, stream: TokenStream) -> TokenStream { Some(route) => { match route.module_file.as_str() { #(#matches)* - _ => unreachable!() + f => { + println!("reached unreachable endpoint: request - {:?} - module_file - {:?} - route - {:?}", f, request_uri, route); + unreachable!() + } } } None => unreachable!(), diff --git a/examples/route-merge/Cargo.toml b/examples/route-merge/Cargo.toml index f1e99e7..5dfec24 100644 --- a/examples/route-merge/Cargo.toml +++ b/examples/route-merge/Cargo.toml @@ -12,8 +12,8 @@ serde_json = { version = "1.0.86", features = ["raw_value"] } serde_derive = "1.0.9" rand = "0.8.5" url = "2.3.1" -# vercel_runtime = { version = "1.0.0", path = "../../crates/vercel_runtime" } -vercel_runtime = "1.0.0" +vercel_runtime = { version = "1.0.0", path = "../../crates/vercel_runtime" } +# vercel_runtime = "1.0.0" [[bin]] name = "main"