diff --git a/examples/realworld/api_server_sdk/blueprint.ron b/examples/realworld/api_server_sdk/blueprint.ron index 0e51d7ddd..c8bb67c44 100644 --- a/examples/realworld/api_server_sdk/blueprint.ron +++ b/examples/realworld/api_server_sdk/blueprint.ron @@ -35,7 +35,7 @@ constructor: ( callable: ( registered_at: "conduit_core", - import_path: "pavex::request::route::RouteParams::extract", + import_path: "pavex::request::path::PathParams::extract", ), location: ( line: 42, @@ -48,7 +48,7 @@ error_handler: Some(( callable: ( registered_at: "conduit_core", - import_path: "pavex::request::route::errors::ExtractRouteParamsError::into_response", + import_path: "pavex::request::path::errors::ExtractPathParamsError::into_response", ), location: ( line: 46, diff --git a/examples/realworld/api_server_sdk/src/lib.rs b/examples/realworld/api_server_sdk/src/lib.rs index a1efd5568..7d17c9dc0 100644 --- a/examples/realworld/api_server_sdk/src/lib.rs +++ b/examples/realworld/api_server_sdk/src/lib.rs @@ -89,7 +89,7 @@ async fn route_request( vec![], ) .into(); - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "*", ); return route_2::middleware_0( @@ -102,12 +102,12 @@ async fn route_request( }; let route_id = matched_route.value; #[allow(unused)] - let url_params: pavex::request::route::RawRouteParams<'_, '_> = matched_route + let url_params: pavex::request::path::RawPathParams<'_, '_> = matched_route .params .into(); match route_id { 0u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/api/ping", ); match &request_head.method { @@ -129,7 +129,7 @@ async fn route_request( } } 1u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/articles", ); match &request_head.method { @@ -160,7 +160,7 @@ async fn route_request( } } 2u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/articles/:slug", ); match &request_head.method { @@ -206,7 +206,7 @@ async fn route_request( } } 3u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/articles/:slug/comments", ); match &request_head.method { @@ -243,7 +243,7 @@ async fn route_request( } } 4u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/articles/:slug/comments/:comment_id", ); match &request_head.method { @@ -270,7 +270,7 @@ async fn route_request( } } 5u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/articles/:slug/favorite", ); match &request_head.method { @@ -306,7 +306,7 @@ async fn route_request( } } 6u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/articles/feed", ); match &request_head.method { @@ -328,7 +328,7 @@ async fn route_request( } } 7u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/profiles/:username", ); match &request_head.method { @@ -355,7 +355,7 @@ async fn route_request( } } 8u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/profiles/:username/follow", ); match &request_head.method { @@ -391,7 +391,7 @@ async fn route_request( } } 9u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/tags", ); match &request_head.method { @@ -413,7 +413,7 @@ async fn route_request( } } 10u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/user", ); match &request_head.method { @@ -444,7 +444,7 @@ async fn route_request( } } 11u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/users", ); match &request_head.method { @@ -473,7 +473,7 @@ async fn route_request( } } 12u32 => { - let matched_route_template = pavex::request::route::MatchedRouteTemplate::new( + let matched_route_template = pavex::request::path::MatchedPathPattern::new( "/users/login", ); match &request_head.method { @@ -506,7 +506,7 @@ async fn route_request( } pub mod route_0 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, + v0: pavex::request::path::MatchedPathPattern, v1: &pavex::request::RequestHead, ) -> pavex::response::Response { let v2 = conduit_core::telemetry::RootSpan::new(v1, v0); @@ -539,7 +539,7 @@ pub mod route_0 { } pub mod route_1 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, + v0: pavex::request::path::MatchedPathPattern, v1: &pavex::request::RequestHead, ) -> pavex::response::Response { let v2 = conduit_core::telemetry::RootSpan::new(v1, v0); @@ -572,7 +572,7 @@ pub mod route_1 { } pub mod route_2 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, + v0: pavex::request::path::MatchedPathPattern, v1: &pavex::router::AllowedMethods, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { @@ -610,7 +610,7 @@ pub mod route_2 { } pub mod route_3 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, + v0: pavex::request::path::MatchedPathPattern, v1: &sqlx_core::driver_prelude::pool::Pool, v2: &jsonwebtoken::EncodingKey, v3: pavex::request::body::RawIncomingBody, @@ -706,7 +706,7 @@ pub mod route_3 { } pub mod route_4 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, + v0: pavex::request::path::MatchedPathPattern, v1: &sqlx_core::driver_prelude::pool::Pool, v2: &jsonwebtoken::EncodingKey, v3: pavex::request::body::RawIncomingBody, @@ -802,7 +802,7 @@ pub mod route_4 { } pub mod route_5 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, + v0: pavex::request::path::MatchedPathPattern, v1: &pavex::request::RequestHead, ) -> pavex::response::Response { let v2 = conduit_core::telemetry::RootSpan::new(v1, v0); @@ -835,7 +835,7 @@ pub mod route_5 { } pub mod route_6 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, + v0: pavex::request::path::MatchedPathPattern, v1: pavex::request::body::RawIncomingBody, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { @@ -908,8 +908,8 @@ pub mod route_6 { } pub mod route_7 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = conduit_core::telemetry::RootSpan::new(v2, v0); @@ -921,14 +921,14 @@ pub mod route_7 { conduit_core::telemetry::logger(v5, v3).await } pub async fn handler( - v0: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::RawPathParams<'_, '_>, ) -> pavex::response::Response { - let v1 = pavex::request::route::RouteParams::extract(v0); + let v1 = pavex::request::path::PathParams::extract(v0); let v2 = match v1 { Ok(ok) => ok, Err(v2) => { return { - let v3 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v3 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v2, ); ::into_response( @@ -944,8 +944,8 @@ pub mod route_7 { where T: std::future::Future, { - s_0: pavex::request::route::RawRouteParams<'a, 'b>, - next: fn(pavex::request::route::RawRouteParams<'a, 'b>) -> T, + s_0: pavex::request::path::RawPathParams<'a, 'b>, + next: fn(pavex::request::path::RawPathParams<'a, 'b>) -> T, } impl<'a, 'b, T> std::future::IntoFuture for Next0<'a, 'b, T> where @@ -960,8 +960,8 @@ pub mod route_7 { } pub mod route_8 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = conduit_core::telemetry::RootSpan::new(v2, v0); @@ -973,14 +973,14 @@ pub mod route_8 { conduit_core::telemetry::logger(v5, v3).await } pub async fn handler( - v0: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::RawPathParams<'_, '_>, ) -> pavex::response::Response { - let v1 = pavex::request::route::RouteParams::extract(v0); + let v1 = pavex::request::path::PathParams::extract(v0); let v2 = match v1 { Ok(ok) => ok, Err(v2) => { return { - let v3 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v3 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v2, ); ::into_response( @@ -996,8 +996,8 @@ pub mod route_8 { where T: std::future::Future, { - s_0: pavex::request::route::RawRouteParams<'a, 'b>, - next: fn(pavex::request::route::RawRouteParams<'a, 'b>) -> T, + s_0: pavex::request::path::RawPathParams<'a, 'b>, + next: fn(pavex::request::path::RawPathParams<'a, 'b>) -> T, } impl<'a, 'b, T> std::future::IntoFuture for Next0<'a, 'b, T> where @@ -1012,8 +1012,8 @@ pub mod route_8 { } pub mod route_9 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = conduit_core::telemetry::RootSpan::new(v2, v0); @@ -1025,14 +1025,14 @@ pub mod route_9 { conduit_core::telemetry::logger(v5, v3).await } pub async fn handler( - v0: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::RawPathParams<'_, '_>, ) -> pavex::response::Response { - let v1 = pavex::request::route::RouteParams::extract(v0); + let v1 = pavex::request::path::PathParams::extract(v0); let v2 = match v1 { Ok(ok) => ok, Err(v2) => { return { - let v3 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v3 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v2, ); ::into_response( @@ -1048,8 +1048,8 @@ pub mod route_9 { where T: std::future::Future, { - s_0: pavex::request::route::RawRouteParams<'a, 'b>, - next: fn(pavex::request::route::RawRouteParams<'a, 'b>) -> T, + s_0: pavex::request::path::RawPathParams<'a, 'b>, + next: fn(pavex::request::path::RawPathParams<'a, 'b>) -> T, } impl<'a, 'b, T> std::future::IntoFuture for Next0<'a, 'b, T> where @@ -1064,7 +1064,7 @@ pub mod route_9 { } pub mod route_10 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, + v0: pavex::request::path::MatchedPathPattern, v1: &pavex::request::RequestHead, ) -> pavex::response::Response { let v2 = conduit_core::telemetry::RootSpan::new(v1, v0); @@ -1113,7 +1113,7 @@ pub mod route_10 { } pub mod route_11 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, + v0: pavex::request::path::MatchedPathPattern, v1: pavex::request::body::RawIncomingBody, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { @@ -1186,7 +1186,7 @@ pub mod route_11 { } pub mod route_12 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, + v0: pavex::request::path::MatchedPathPattern, v1: &pavex::request::RequestHead, ) -> pavex::response::Response { let v2 = conduit_core::telemetry::RootSpan::new(v1, v0); @@ -1235,8 +1235,8 @@ pub mod route_12 { } pub mod route_13 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = conduit_core::telemetry::RootSpan::new(v2, v0); @@ -1248,14 +1248,14 @@ pub mod route_13 { conduit_core::telemetry::logger(v5, v3).await } pub async fn handler( - v0: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::RawPathParams<'_, '_>, ) -> pavex::response::Response { - let v1 = pavex::request::route::RouteParams::extract(v0); + let v1 = pavex::request::path::PathParams::extract(v0); let v2 = match v1 { Ok(ok) => ok, Err(v2) => { return { - let v3 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v3 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v2, ); ::into_response( @@ -1271,8 +1271,8 @@ pub mod route_13 { where T: std::future::Future, { - s_0: pavex::request::route::RawRouteParams<'a, 'b>, - next: fn(pavex::request::route::RawRouteParams<'a, 'b>) -> T, + s_0: pavex::request::path::RawPathParams<'a, 'b>, + next: fn(pavex::request::path::RawPathParams<'a, 'b>) -> T, } impl<'a, 'b, T> std::future::IntoFuture for Next0<'a, 'b, T> where @@ -1287,8 +1287,8 @@ pub mod route_13 { } pub mod route_14 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = conduit_core::telemetry::RootSpan::new(v2, v0); @@ -1300,14 +1300,14 @@ pub mod route_14 { conduit_core::telemetry::logger(v5, v3).await } pub async fn handler( - v0: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::RawPathParams<'_, '_>, ) -> pavex::response::Response { - let v1 = pavex::request::route::RouteParams::extract(v0); + let v1 = pavex::request::path::PathParams::extract(v0); let v2 = match v1 { Ok(ok) => ok, Err(v2) => { return { - let v3 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v3 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v2, ); ::into_response( @@ -1323,8 +1323,8 @@ pub mod route_14 { where T: std::future::Future, { - s_0: pavex::request::route::RawRouteParams<'a, 'b>, - next: fn(pavex::request::route::RawRouteParams<'a, 'b>) -> T, + s_0: pavex::request::path::RawPathParams<'a, 'b>, + next: fn(pavex::request::path::RawPathParams<'a, 'b>) -> T, } impl<'a, 'b, T> std::future::IntoFuture for Next0<'a, 'b, T> where @@ -1339,8 +1339,8 @@ pub mod route_14 { } pub mod route_15 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: pavex::request::body::RawIncomingBody, v3: &pavex::request::RequestHead, ) -> pavex::response::Response { @@ -1356,7 +1356,7 @@ pub mod route_15 { } pub async fn handler( v0: pavex::request::body::RawIncomingBody, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = ::default(); @@ -1388,12 +1388,12 @@ pub mod route_15 { }; } }; - let v8 = pavex::request::route::RouteParams::extract(v1); + let v8 = pavex::request::path::PathParams::extract(v1); let v9 = match v8 { Ok(ok) => ok, Err(v9) => { return { - let v10 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v10 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v9, ); ::into_response( @@ -1410,11 +1410,11 @@ pub mod route_15 { T: std::future::Future, { s_0: pavex::request::body::RawIncomingBody, - s_1: pavex::request::route::RawRouteParams<'a, 'b>, + s_1: pavex::request::path::RawPathParams<'a, 'b>, s_2: &'c pavex::request::RequestHead, next: fn( pavex::request::body::RawIncomingBody, - pavex::request::route::RawRouteParams<'a, 'b>, + pavex::request::path::RawPathParams<'a, 'b>, &'c pavex::request::RequestHead, ) -> T, } @@ -1431,8 +1431,8 @@ pub mod route_15 { } pub mod route_16 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = conduit_core::telemetry::RootSpan::new(v2, v0); @@ -1444,14 +1444,14 @@ pub mod route_16 { conduit_core::telemetry::logger(v5, v3).await } pub async fn handler( - v0: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::RawPathParams<'_, '_>, ) -> pavex::response::Response { - let v1 = pavex::request::route::RouteParams::extract(v0); + let v1 = pavex::request::path::PathParams::extract(v0); let v2 = match v1 { Ok(ok) => ok, Err(v2) => { return { - let v3 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v3 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v2, ); ::into_response( @@ -1467,8 +1467,8 @@ pub mod route_16 { where T: std::future::Future, { - s_0: pavex::request::route::RawRouteParams<'a, 'b>, - next: fn(pavex::request::route::RawRouteParams<'a, 'b>) -> T, + s_0: pavex::request::path::RawPathParams<'a, 'b>, + next: fn(pavex::request::path::RawPathParams<'a, 'b>) -> T, } impl<'a, 'b, T> std::future::IntoFuture for Next0<'a, 'b, T> where @@ -1483,8 +1483,8 @@ pub mod route_16 { } pub mod route_17 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = conduit_core::telemetry::RootSpan::new(v2, v0); @@ -1496,14 +1496,14 @@ pub mod route_17 { conduit_core::telemetry::logger(v5, v3).await } pub async fn handler( - v0: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::RawPathParams<'_, '_>, ) -> pavex::response::Response { - let v1 = pavex::request::route::RouteParams::extract(v0); + let v1 = pavex::request::path::PathParams::extract(v0); let v2 = match v1 { Ok(ok) => ok, Err(v2) => { return { - let v3 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v3 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v2, ); ::into_response( @@ -1519,8 +1519,8 @@ pub mod route_17 { where T: std::future::Future, { - s_0: pavex::request::route::RawRouteParams<'a, 'b>, - next: fn(pavex::request::route::RawRouteParams<'a, 'b>) -> T, + s_0: pavex::request::path::RawPathParams<'a, 'b>, + next: fn(pavex::request::path::RawPathParams<'a, 'b>) -> T, } impl<'a, 'b, T> std::future::IntoFuture for Next0<'a, 'b, T> where @@ -1535,8 +1535,8 @@ pub mod route_17 { } pub mod route_18 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = conduit_core::telemetry::RootSpan::new(v2, v0); @@ -1548,14 +1548,14 @@ pub mod route_18 { conduit_core::telemetry::logger(v5, v3).await } pub async fn handler( - v0: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::RawPathParams<'_, '_>, ) -> pavex::response::Response { - let v1 = pavex::request::route::RouteParams::extract(v0); + let v1 = pavex::request::path::PathParams::extract(v0); let v2 = match v1 { Ok(ok) => ok, Err(v2) => { return { - let v3 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v3 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v2, ); ::into_response( @@ -1571,8 +1571,8 @@ pub mod route_18 { where T: std::future::Future, { - s_0: pavex::request::route::RawRouteParams<'a, 'b>, - next: fn(pavex::request::route::RawRouteParams<'a, 'b>) -> T, + s_0: pavex::request::path::RawPathParams<'a, 'b>, + next: fn(pavex::request::path::RawPathParams<'a, 'b>) -> T, } impl<'a, 'b, T> std::future::IntoFuture for Next0<'a, 'b, T> where @@ -1587,8 +1587,8 @@ pub mod route_18 { } pub mod route_19 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: pavex::request::body::RawIncomingBody, v3: &pavex::request::RequestHead, ) -> pavex::response::Response { @@ -1604,7 +1604,7 @@ pub mod route_19 { } pub async fn handler( v0: pavex::request::body::RawIncomingBody, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = ::default(); @@ -1636,12 +1636,12 @@ pub mod route_19 { }; } }; - let v8 = pavex::request::route::RouteParams::extract(v1); + let v8 = pavex::request::path::PathParams::extract(v1); let v9 = match v8 { Ok(ok) => ok, Err(v9) => { return { - let v10 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v10 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v9, ); ::into_response( @@ -1658,11 +1658,11 @@ pub mod route_19 { T: std::future::Future, { s_0: pavex::request::body::RawIncomingBody, - s_1: pavex::request::route::RawRouteParams<'a, 'b>, + s_1: pavex::request::path::RawPathParams<'a, 'b>, s_2: &'c pavex::request::RequestHead, next: fn( pavex::request::body::RawIncomingBody, - pavex::request::route::RawRouteParams<'a, 'b>, + pavex::request::path::RawPathParams<'a, 'b>, &'c pavex::request::RequestHead, ) -> T, } @@ -1679,8 +1679,8 @@ pub mod route_19 { } pub mod route_20 { pub async fn middleware_0( - v0: pavex::request::route::MatchedRouteTemplate, - v1: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::MatchedPathPattern, + v1: pavex::request::path::RawPathParams<'_, '_>, v2: &pavex::request::RequestHead, ) -> pavex::response::Response { let v3 = conduit_core::telemetry::RootSpan::new(v2, v0); @@ -1692,14 +1692,14 @@ pub mod route_20 { conduit_core::telemetry::logger(v5, v3).await } pub async fn handler( - v0: pavex::request::route::RawRouteParams<'_, '_>, + v0: pavex::request::path::RawPathParams<'_, '_>, ) -> pavex::response::Response { - let v1 = pavex::request::route::RouteParams::extract(v0); + let v1 = pavex::request::path::PathParams::extract(v0); let v2 = match v1 { Ok(ok) => ok, Err(v2) => { return { - let v3 = pavex::request::route::errors::ExtractRouteParamsError::into_response( + let v3 = pavex::request::path::errors::ExtractPathParamsError::into_response( &v2, ); ::into_response( @@ -1715,8 +1715,8 @@ pub mod route_20 { where T: std::future::Future, { - s_0: pavex::request::route::RawRouteParams<'a, 'b>, - next: fn(pavex::request::route::RawRouteParams<'a, 'b>) -> T, + s_0: pavex::request::path::RawPathParams<'a, 'b>, + next: fn(pavex::request::path::RawPathParams<'a, 'b>) -> T, } impl<'a, 'b, T> std::future::IntoFuture for Next0<'a, 'b, T> where diff --git a/examples/realworld/conduit_core/src/blueprint.rs b/examples/realworld/conduit_core/src/blueprint.rs index 116ba2333..84b6a2735 100644 --- a/examples/realworld/conduit_core/src/blueprint.rs +++ b/examples/realworld/conduit_core/src/blueprint.rs @@ -40,11 +40,11 @@ fn register_common_constructors(bp: &mut Blueprint) { // Route parameters bp.constructor( - f!(pavex::request::route::RouteParams::extract), + f!(pavex::request::path::PathParams::extract), Lifecycle::RequestScoped, ) .error_handler(f!( - pavex::request::route::errors::ExtractRouteParamsError::into_response + pavex::request::path::errors::ExtractPathParamsError::into_response )); // Json body diff --git a/examples/realworld/conduit_core/src/routes/articles/delete_article.rs b/examples/realworld/conduit_core/src/routes/articles/delete_article.rs index f284291aa..1fd28c607 100644 --- a/examples/realworld/conduit_core/src/routes/articles/delete_article.rs +++ b/examples/realworld/conduit_core/src/routes/articles/delete_article.rs @@ -1,11 +1,11 @@ -use pavex::{http::StatusCode, request::route::RouteParams}; +use pavex::{http::StatusCode, request::path::PathParams}; #[derive(Debug)] -#[RouteParams] +#[PathParams] pub struct DeleteArticle { pub slug: String, } -pub fn delete_article(_params: RouteParams) -> StatusCode { +pub fn delete_article(_params: PathParams) -> StatusCode { StatusCode::OK } diff --git a/examples/realworld/conduit_core/src/routes/articles/delete_comment.rs b/examples/realworld/conduit_core/src/routes/articles/delete_comment.rs index 5876b31c6..94e2be653 100644 --- a/examples/realworld/conduit_core/src/routes/articles/delete_comment.rs +++ b/examples/realworld/conduit_core/src/routes/articles/delete_comment.rs @@ -1,12 +1,12 @@ -use pavex::{http::StatusCode, request::route::RouteParams}; +use pavex::{http::StatusCode, request::path::PathParams}; #[derive(Debug)] -#[RouteParams] +#[PathParams] pub struct DeleteComment { pub slug: String, pub comment_id: u64, } -pub fn delete_comment(_route: RouteParams) -> StatusCode { +pub fn delete_comment(_route: PathParams) -> StatusCode { StatusCode::OK } diff --git a/examples/realworld/conduit_core/src/routes/articles/favorite_article.rs b/examples/realworld/conduit_core/src/routes/articles/favorite_article.rs index 5895fd34c..1a1b23558 100644 --- a/examples/realworld/conduit_core/src/routes/articles/favorite_article.rs +++ b/examples/realworld/conduit_core/src/routes/articles/favorite_article.rs @@ -1,9 +1,9 @@ -use pavex::{http::StatusCode, request::route::RouteParams}; +use pavex::{http::StatusCode, request::path::PathParams}; use crate::schemas::Article; #[derive(Debug)] -#[RouteParams] +#[PathParams] pub struct FavoriteArticle { pub slug: String, } @@ -14,6 +14,6 @@ pub struct FavoriteArticleResponse { pub article: Article, } -pub fn favorite_article(_params: RouteParams) -> StatusCode { +pub fn favorite_article(_params: PathParams) -> StatusCode { StatusCode::OK } diff --git a/examples/realworld/conduit_core/src/routes/articles/get_article.rs b/examples/realworld/conduit_core/src/routes/articles/get_article.rs index a34971f24..4b6fb4ab4 100644 --- a/examples/realworld/conduit_core/src/routes/articles/get_article.rs +++ b/examples/realworld/conduit_core/src/routes/articles/get_article.rs @@ -1,9 +1,9 @@ -use pavex::{http::StatusCode, request::route::RouteParams}; +use pavex::{http::StatusCode, request::path::PathParams}; use crate::schemas::Article; #[derive(Debug)] -#[RouteParams] +#[PathParams] pub struct GetArticle { pub slug: String, } @@ -14,6 +14,6 @@ pub struct GetArticleResponse { pub article: Article, } -pub fn get_article(_params: RouteParams) -> StatusCode { +pub fn get_article(_params: PathParams) -> StatusCode { StatusCode::OK } diff --git a/examples/realworld/conduit_core/src/routes/articles/list_comments.rs b/examples/realworld/conduit_core/src/routes/articles/list_comments.rs index a1d018f6f..2ef7c9bf3 100644 --- a/examples/realworld/conduit_core/src/routes/articles/list_comments.rs +++ b/examples/realworld/conduit_core/src/routes/articles/list_comments.rs @@ -1,9 +1,9 @@ -use pavex::{http::StatusCode, request::route::RouteParams}; +use pavex::{http::StatusCode, request::path::PathParams}; use crate::schemas::Comment; #[derive(Debug)] -#[RouteParams] +#[PathParams] pub struct ListComments { pub slug: String, } @@ -14,6 +14,6 @@ pub struct ListCommentsResponse { pub comments: Vec, } -pub fn list_comments(_route: RouteParams) -> StatusCode { +pub fn list_comments(_route: PathParams) -> StatusCode { StatusCode::OK } diff --git a/examples/realworld/conduit_core/src/routes/articles/publish_comment.rs b/examples/realworld/conduit_core/src/routes/articles/publish_comment.rs index e959e9224..5036fbe09 100644 --- a/examples/realworld/conduit_core/src/routes/articles/publish_comment.rs +++ b/examples/realworld/conduit_core/src/routes/articles/publish_comment.rs @@ -1,12 +1,12 @@ use pavex::{ http::StatusCode, - request::{body::JsonBody, route::RouteParams}, + request::{body::JsonBody, path::PathParams}, }; use crate::schemas::Comment; #[derive(Debug)] -#[RouteParams] +#[PathParams] pub struct PublishCommentRoute { pub slug: String, } @@ -30,7 +30,7 @@ pub struct PublishCommentResponse { } pub fn publish_comment( - _route: RouteParams, + _route: PathParams, _body: JsonBody, ) -> StatusCode { StatusCode::OK diff --git a/examples/realworld/conduit_core/src/routes/articles/unfavorite_article.rs b/examples/realworld/conduit_core/src/routes/articles/unfavorite_article.rs index 5fd95b271..74d8c7dba 100644 --- a/examples/realworld/conduit_core/src/routes/articles/unfavorite_article.rs +++ b/examples/realworld/conduit_core/src/routes/articles/unfavorite_article.rs @@ -1,9 +1,9 @@ -use pavex::{http::StatusCode, request::route::RouteParams}; +use pavex::{http::StatusCode, request::path::PathParams}; use crate::schemas::Article; #[derive(Debug)] -#[RouteParams] +#[PathParams] pub struct UnfavoriteArticle { pub slug: String, } @@ -14,6 +14,6 @@ pub struct UnfavoriteArticleResponse { pub article: Article, } -pub fn unfavorite_article(_params: RouteParams) -> StatusCode { +pub fn unfavorite_article(_params: PathParams) -> StatusCode { StatusCode::OK } diff --git a/examples/realworld/conduit_core/src/routes/articles/update_article.rs b/examples/realworld/conduit_core/src/routes/articles/update_article.rs index 0626996a3..0bcf7bf03 100644 --- a/examples/realworld/conduit_core/src/routes/articles/update_article.rs +++ b/examples/realworld/conduit_core/src/routes/articles/update_article.rs @@ -1,6 +1,6 @@ use pavex::{ http::StatusCode, - request::{body::JsonBody, route::RouteParams}, + request::{body::JsonBody, path::PathParams}, }; use crate::schemas::Article; @@ -14,7 +14,7 @@ pub struct UpdateArticleBody { } #[derive(Debug)] -#[RouteParams] +#[PathParams] pub struct UpdateArticleRoute { pub slug: String, } @@ -26,7 +26,7 @@ pub struct UpdateArticleResponse { } pub fn update_article( - _params: RouteParams, + _params: PathParams, _body: JsonBody, ) -> StatusCode { StatusCode::OK diff --git a/examples/realworld/conduit_core/src/routes/profiles/follow_profile.rs b/examples/realworld/conduit_core/src/routes/profiles/follow_profile.rs index d6a1ebb53..162ca5ba6 100644 --- a/examples/realworld/conduit_core/src/routes/profiles/follow_profile.rs +++ b/examples/realworld/conduit_core/src/routes/profiles/follow_profile.rs @@ -1,9 +1,9 @@ -use pavex::{http::StatusCode, request::route::RouteParams}; +use pavex::{http::StatusCode, request::path::PathParams}; use crate::schemas::Profile; #[derive(Debug)] -#[RouteParams] +#[PathParams] pub struct FollowProfile { pub username: String, } @@ -14,6 +14,6 @@ pub struct FollowProfileResponse { pub profile: Profile, } -pub fn follow_profile(_params: RouteParams) -> StatusCode { +pub fn follow_profile(_params: PathParams) -> StatusCode { StatusCode::OK } diff --git a/examples/realworld/conduit_core/src/routes/profiles/get_profile.rs b/examples/realworld/conduit_core/src/routes/profiles/get_profile.rs index a42e3a8cd..f973a8200 100644 --- a/examples/realworld/conduit_core/src/routes/profiles/get_profile.rs +++ b/examples/realworld/conduit_core/src/routes/profiles/get_profile.rs @@ -1,9 +1,9 @@ -use pavex::{http::StatusCode, request::route::RouteParams}; +use pavex::{http::StatusCode, request::path::PathParams}; use crate::schemas::Profile; #[derive(Debug)] -#[RouteParams] +#[PathParams] pub struct GetProfile { pub username: String, } @@ -14,6 +14,6 @@ pub struct GetProfileResponse { pub profile: Profile, } -pub fn get_profile(_params: RouteParams) -> StatusCode { +pub fn get_profile(_params: PathParams) -> StatusCode { StatusCode::OK } diff --git a/examples/realworld/conduit_core/src/routes/profiles/unfollow_profile.rs b/examples/realworld/conduit_core/src/routes/profiles/unfollow_profile.rs index 0b2377322..89adf3aaf 100644 --- a/examples/realworld/conduit_core/src/routes/profiles/unfollow_profile.rs +++ b/examples/realworld/conduit_core/src/routes/profiles/unfollow_profile.rs @@ -1,8 +1,8 @@ -use pavex::{http::StatusCode, request::route::RouteParams}; +use pavex::{http::StatusCode, request::path::PathParams}; use crate::schemas::Profile; -#[RouteParams] +#[PathParams] #[derive(Debug)] pub struct UnfollowProfile { pub username: String, @@ -14,6 +14,6 @@ pub struct UnfollowProfileResponse { pub profile: Profile, } -pub fn unfollow_profile(_params: RouteParams) -> StatusCode { +pub fn unfollow_profile(_params: PathParams) -> StatusCode { StatusCode::OK } diff --git a/examples/realworld/conduit_core/src/telemetry.rs b/examples/realworld/conduit_core/src/telemetry.rs index ff4536953..22fedc7be 100644 --- a/examples/realworld/conduit_core/src/telemetry.rs +++ b/examples/realworld/conduit_core/src/telemetry.rs @@ -1,6 +1,6 @@ use pavex::http::Version; use pavex::middleware::Next; -use pavex::request::route::MatchedRouteTemplate; +use pavex::request::path::MatchedPathPattern; use pavex::request::RequestHead; use pavex::response::Response; use std::borrow::Cow; @@ -24,7 +24,7 @@ impl RootSpan { /// /// We follow OpenTelemetry's HTTP semantic conventions as closely as /// possible for field naming. - pub fn new(request_head: &RequestHead, matched_route: MatchedRouteTemplate) -> Self { + pub fn new(request_head: &RequestHead, matched_route: MatchedPathPattern) -> Self { let user_agent = request_head .headers .get("User-Agent") diff --git a/examples/skeleton/app_server_sdk/src/lib.rs b/examples/skeleton/app_server_sdk/src/lib.rs index 6469c5d83..c0aa764dd 100644 --- a/examples/skeleton/app_server_sdk/src/lib.rs +++ b/examples/skeleton/app_server_sdk/src/lib.rs @@ -50,7 +50,7 @@ async fn route_request( }; let route_id = matched_route.value; #[allow(unused)] - let url_params: pavex::request::route::RawRouteParams<'_, '_> = matched_route + let url_params: pavex::request::path::RawPathParams<'_, '_> = matched_route .params .into(); match route_id {