diff --git a/doc_examples/guide/dependency_injection/cookbook/project/server_sdk/src/lib.rs b/doc_examples/guide/dependency_injection/cookbook/project/server_sdk/src/lib.rs index 001afbed5..5b691e69d 100644 --- a/doc_examples/guide/dependency_injection/cookbook/project/server_sdk/src/lib.rs +++ b/doc_examples/guide/dependency_injection/cookbook/project/server_sdk/src/lib.rs @@ -37,31 +37,23 @@ async fn route_request( let matched_route = match server_state.router.at(&request_head.uri.path()) { Ok(m) => m, Err(_) => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter( - vec![], - ) - .into(); + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter(vec![]).into(); return route_1::handler(&allowed_methods).await; } }; let route_id = matched_route.value; #[allow(unused)] - let url_params: pavex::request::route::RawRouteParams<'_, '_> = matched_route - .params - .into(); + let url_params: pavex::request::path::RawPathParams<'_, '_> = matched_route.params.into(); match route_id { - 0u32 => { - match &request_head.method { - &pavex::http::Method::GET => route_0::handler().await, - _ => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter([ - pavex::http::Method::GET, - ]) - .into(); - route_1::handler(&allowed_methods).await - } + 0u32 => match &request_head.method { + &pavex::http::Method::GET => route_0::handler().await, + _ => { + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter([pavex::http::Method::GET]).into(); + route_1::handler(&allowed_methods).await } - } + }, i => unreachable!("Unknown route id: {}", i), } } @@ -72,9 +64,7 @@ pub mod route_0 { } } pub mod route_1 { - pub async fn handler( - v0: &pavex::router::AllowedMethods, - ) -> pavex::response::Response { + pub async fn handler(v0: &pavex::router::AllowedMethods) -> pavex::response::Response { let v1 = pavex::router::default_fallback(v0).await; ::into_response(v1) } diff --git a/doc_examples/guide/dependency_injection/user_middleware/project/server_sdk/src/lib.rs b/doc_examples/guide/dependency_injection/user_middleware/project/server_sdk/src/lib.rs index 14dbe83a9..2276a7e35 100644 --- a/doc_examples/guide/dependency_injection/user_middleware/project/server_sdk/src/lib.rs +++ b/doc_examples/guide/dependency_injection/user_middleware/project/server_sdk/src/lib.rs @@ -47,7 +47,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 { diff --git a/doc_examples/guide/request_data/buffered_body/project/server_sdk/src/lib.rs b/doc_examples/guide/request_data/buffered_body/project/server_sdk/src/lib.rs index 001afbed5..5b691e69d 100644 --- a/doc_examples/guide/request_data/buffered_body/project/server_sdk/src/lib.rs +++ b/doc_examples/guide/request_data/buffered_body/project/server_sdk/src/lib.rs @@ -37,31 +37,23 @@ async fn route_request( let matched_route = match server_state.router.at(&request_head.uri.path()) { Ok(m) => m, Err(_) => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter( - vec![], - ) - .into(); + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter(vec![]).into(); return route_1::handler(&allowed_methods).await; } }; let route_id = matched_route.value; #[allow(unused)] - let url_params: pavex::request::route::RawRouteParams<'_, '_> = matched_route - .params - .into(); + let url_params: pavex::request::path::RawPathParams<'_, '_> = matched_route.params.into(); match route_id { - 0u32 => { - match &request_head.method { - &pavex::http::Method::GET => route_0::handler().await, - _ => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter([ - pavex::http::Method::GET, - ]) - .into(); - route_1::handler(&allowed_methods).await - } + 0u32 => match &request_head.method { + &pavex::http::Method::GET => route_0::handler().await, + _ => { + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter([pavex::http::Method::GET]).into(); + route_1::handler(&allowed_methods).await } - } + }, i => unreachable!("Unknown route id: {}", i), } } @@ -72,9 +64,7 @@ pub mod route_0 { } } pub mod route_1 { - pub async fn handler( - v0: &pavex::router::AllowedMethods, - ) -> pavex::response::Response { + pub async fn handler(v0: &pavex::router::AllowedMethods) -> pavex::response::Response { let v1 = pavex::router::default_fallback(v0).await; ::into_response(v1) } diff --git a/doc_examples/guide/request_data/json/project/server_sdk/src/lib.rs b/doc_examples/guide/request_data/json/project/server_sdk/src/lib.rs index 001afbed5..5b691e69d 100644 --- a/doc_examples/guide/request_data/json/project/server_sdk/src/lib.rs +++ b/doc_examples/guide/request_data/json/project/server_sdk/src/lib.rs @@ -37,31 +37,23 @@ async fn route_request( let matched_route = match server_state.router.at(&request_head.uri.path()) { Ok(m) => m, Err(_) => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter( - vec![], - ) - .into(); + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter(vec![]).into(); return route_1::handler(&allowed_methods).await; } }; let route_id = matched_route.value; #[allow(unused)] - let url_params: pavex::request::route::RawRouteParams<'_, '_> = matched_route - .params - .into(); + let url_params: pavex::request::path::RawPathParams<'_, '_> = matched_route.params.into(); match route_id { - 0u32 => { - match &request_head.method { - &pavex::http::Method::GET => route_0::handler().await, - _ => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter([ - pavex::http::Method::GET, - ]) - .into(); - route_1::handler(&allowed_methods).await - } + 0u32 => match &request_head.method { + &pavex::http::Method::GET => route_0::handler().await, + _ => { + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter([pavex::http::Method::GET]).into(); + route_1::handler(&allowed_methods).await } - } + }, i => unreachable!("Unknown route id: {}", i), } } @@ -72,9 +64,7 @@ pub mod route_0 { } } pub mod route_1 { - pub async fn handler( - v0: &pavex::router::AllowedMethods, - ) -> pavex::response::Response { + pub async fn handler(v0: &pavex::router::AllowedMethods) -> pavex::response::Response { let v1 = pavex::router::default_fallback(v0).await; ::into_response(v1) } diff --git a/doc_examples/guide/request_data/path/project/server_sdk/src/lib.rs b/doc_examples/guide/request_data/path/project/server_sdk/src/lib.rs index 001afbed5..5b691e69d 100644 --- a/doc_examples/guide/request_data/path/project/server_sdk/src/lib.rs +++ b/doc_examples/guide/request_data/path/project/server_sdk/src/lib.rs @@ -37,31 +37,23 @@ async fn route_request( let matched_route = match server_state.router.at(&request_head.uri.path()) { Ok(m) => m, Err(_) => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter( - vec![], - ) - .into(); + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter(vec![]).into(); return route_1::handler(&allowed_methods).await; } }; let route_id = matched_route.value; #[allow(unused)] - let url_params: pavex::request::route::RawRouteParams<'_, '_> = matched_route - .params - .into(); + let url_params: pavex::request::path::RawPathParams<'_, '_> = matched_route.params.into(); match route_id { - 0u32 => { - match &request_head.method { - &pavex::http::Method::GET => route_0::handler().await, - _ => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter([ - pavex::http::Method::GET, - ]) - .into(); - route_1::handler(&allowed_methods).await - } + 0u32 => match &request_head.method { + &pavex::http::Method::GET => route_0::handler().await, + _ => { + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter([pavex::http::Method::GET]).into(); + route_1::handler(&allowed_methods).await } - } + }, i => unreachable!("Unknown route id: {}", i), } } @@ -72,9 +64,7 @@ pub mod route_0 { } } pub mod route_1 { - pub async fn handler( - v0: &pavex::router::AllowedMethods, - ) -> pavex::response::Response { + pub async fn handler(v0: &pavex::router::AllowedMethods) -> pavex::response::Response { let v1 = pavex::router::default_fallback(v0).await; ::into_response(v1) } diff --git a/doc_examples/guide/request_data/query/project/server_sdk/src/lib.rs b/doc_examples/guide/request_data/query/project/server_sdk/src/lib.rs index 001afbed5..5b691e69d 100644 --- a/doc_examples/guide/request_data/query/project/server_sdk/src/lib.rs +++ b/doc_examples/guide/request_data/query/project/server_sdk/src/lib.rs @@ -37,31 +37,23 @@ async fn route_request( let matched_route = match server_state.router.at(&request_head.uri.path()) { Ok(m) => m, Err(_) => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter( - vec![], - ) - .into(); + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter(vec![]).into(); return route_1::handler(&allowed_methods).await; } }; let route_id = matched_route.value; #[allow(unused)] - let url_params: pavex::request::route::RawRouteParams<'_, '_> = matched_route - .params - .into(); + let url_params: pavex::request::path::RawPathParams<'_, '_> = matched_route.params.into(); match route_id { - 0u32 => { - match &request_head.method { - &pavex::http::Method::GET => route_0::handler().await, - _ => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter([ - pavex::http::Method::GET, - ]) - .into(); - route_1::handler(&allowed_methods).await - } + 0u32 => match &request_head.method { + &pavex::http::Method::GET => route_0::handler().await, + _ => { + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter([pavex::http::Method::GET]).into(); + route_1::handler(&allowed_methods).await } - } + }, i => unreachable!("Unknown route id: {}", i), } } @@ -72,9 +64,7 @@ pub mod route_0 { } } pub mod route_1 { - pub async fn handler( - v0: &pavex::router::AllowedMethods, - ) -> pavex::response::Response { + pub async fn handler(v0: &pavex::router::AllowedMethods) -> pavex::response::Response { let v1 = pavex::router::default_fallback(v0).await; ::into_response(v1) } diff --git a/doc_examples/guide/request_data/query_params/project/server_sdk/src/lib.rs b/doc_examples/guide/request_data/query_params/project/server_sdk/src/lib.rs index 001afbed5..5b691e69d 100644 --- a/doc_examples/guide/request_data/query_params/project/server_sdk/src/lib.rs +++ b/doc_examples/guide/request_data/query_params/project/server_sdk/src/lib.rs @@ -37,31 +37,23 @@ async fn route_request( let matched_route = match server_state.router.at(&request_head.uri.path()) { Ok(m) => m, Err(_) => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter( - vec![], - ) - .into(); + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter(vec![]).into(); return route_1::handler(&allowed_methods).await; } }; let route_id = matched_route.value; #[allow(unused)] - let url_params: pavex::request::route::RawRouteParams<'_, '_> = matched_route - .params - .into(); + let url_params: pavex::request::path::RawPathParams<'_, '_> = matched_route.params.into(); match route_id { - 0u32 => { - match &request_head.method { - &pavex::http::Method::GET => route_0::handler().await, - _ => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter([ - pavex::http::Method::GET, - ]) - .into(); - route_1::handler(&allowed_methods).await - } + 0u32 => match &request_head.method { + &pavex::http::Method::GET => route_0::handler().await, + _ => { + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter([pavex::http::Method::GET]).into(); + route_1::handler(&allowed_methods).await } - } + }, i => unreachable!("Unknown route id: {}", i), } } @@ -72,9 +64,7 @@ pub mod route_0 { } } pub mod route_1 { - pub async fn handler( - v0: &pavex::router::AllowedMethods, - ) -> pavex::response::Response { + pub async fn handler(v0: &pavex::router::AllowedMethods) -> pavex::response::Response { let v1 = pavex::router::default_fallback(v0).await; ::into_response(v1) } diff --git a/doc_examples/guide/request_data/request_target/project/server_sdk/src/lib.rs b/doc_examples/guide/request_data/request_target/project/server_sdk/src/lib.rs index 001afbed5..5b691e69d 100644 --- a/doc_examples/guide/request_data/request_target/project/server_sdk/src/lib.rs +++ b/doc_examples/guide/request_data/request_target/project/server_sdk/src/lib.rs @@ -37,31 +37,23 @@ async fn route_request( let matched_route = match server_state.router.at(&request_head.uri.path()) { Ok(m) => m, Err(_) => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter( - vec![], - ) - .into(); + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter(vec![]).into(); return route_1::handler(&allowed_methods).await; } }; let route_id = matched_route.value; #[allow(unused)] - let url_params: pavex::request::route::RawRouteParams<'_, '_> = matched_route - .params - .into(); + let url_params: pavex::request::path::RawPathParams<'_, '_> = matched_route.params.into(); match route_id { - 0u32 => { - match &request_head.method { - &pavex::http::Method::GET => route_0::handler().await, - _ => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter([ - pavex::http::Method::GET, - ]) - .into(); - route_1::handler(&allowed_methods).await - } + 0u32 => match &request_head.method { + &pavex::http::Method::GET => route_0::handler().await, + _ => { + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter([pavex::http::Method::GET]).into(); + route_1::handler(&allowed_methods).await } - } + }, i => unreachable!("Unknown route id: {}", i), } } @@ -72,9 +64,7 @@ pub mod route_0 { } } pub mod route_1 { - pub async fn handler( - v0: &pavex::router::AllowedMethods, - ) -> pavex::response::Response { + pub async fn handler(v0: &pavex::router::AllowedMethods) -> pavex::response::Response { let v1 = pavex::router::default_fallback(v0).await; ::into_response(v1) } diff --git a/doc_examples/guide/request_data/route_params/project-raw_route_params.snap b/doc_examples/guide/request_data/route_params/project-raw_route_params.snap index 9f7382633..7269203c6 100644 --- a/doc_examples/guide/request_data/route_params/project-raw_route_params.snap +++ b/doc_examples/guide/request_data/route_params/project-raw_route_params.snap @@ -1,8 +1,8 @@ ```rust title="src/raw_route_params/routes.rs" use pavex::http::StatusCode; -use pavex::request::route::RawRouteParams; +use pavex::request::path::RawPathParams; -pub fn handler(params: &RawRouteParams) -> StatusCode { +pub fn handler(params: &RawPathParams) -> StatusCode { for (name, value) in params.iter() { println!("`{name}` was set to `{}`", value.as_str()); } diff --git a/doc_examples/guide/request_data/route_params/project-route_params_extraction.snap b/doc_examples/guide/request_data/route_params/project-route_params_extraction.snap index 0f26cadeb..60bf077df 100644 --- a/doc_examples/guide/request_data/route_params/project-route_params_extraction.snap +++ b/doc_examples/guide/request_data/route_params/project-route_params_extraction.snap @@ -1,13 +1,13 @@ ```rust title="src/route_params/routes.rs" hl_lines="9" use pavex::http::StatusCode; -use pavex::request::route::RouteParams; +use pavex::request::path::PathParams; -#[RouteParams] +#[PathParams] pub struct GetUserParams { pub id: u64, } -pub fn handler(params: &RouteParams) -> StatusCode { +pub fn handler(params: &PathParams) -> StatusCode { println!("The user id is {}", params.0.id); StatusCode::OK } diff --git a/doc_examples/guide/request_data/route_params/project-route_params_struct_with_attr.snap b/doc_examples/guide/request_data/route_params/project-route_params_struct_with_attr.snap index 5d7f0d900..ced08da62 100644 --- a/doc_examples/guide/request_data/route_params/project-route_params_struct_with_attr.snap +++ b/doc_examples/guide/request_data/route_params/project-route_params_struct_with_attr.snap @@ -1,6 +1,6 @@ ```rust title="src/route_params/routes.rs" hl_lines="2" // [...] -#[RouteParams] +#[PathParams] pub struct GetUserParams { pub id: u64, } diff --git a/doc_examples/guide/request_data/route_params/project-route_params_typed_field.snap b/doc_examples/guide/request_data/route_params/project-route_params_typed_field.snap index 4f73622dc..3cd012e0b 100644 --- a/doc_examples/guide/request_data/route_params/project-route_params_typed_field.snap +++ b/doc_examples/guide/request_data/route_params/project-route_params_typed_field.snap @@ -1,6 +1,6 @@ ```rust title="src/route_params/routes.rs" hl_lines="4" // [...] -#[RouteParams] +#[PathParams] pub struct GetUserParams { pub id: u64, } diff --git a/doc_examples/guide/request_data/route_params/project/server_sdk/src/lib.rs b/doc_examples/guide/request_data/route_params/project/server_sdk/src/lib.rs index 001afbed5..5b691e69d 100644 --- a/doc_examples/guide/request_data/route_params/project/server_sdk/src/lib.rs +++ b/doc_examples/guide/request_data/route_params/project/server_sdk/src/lib.rs @@ -37,31 +37,23 @@ async fn route_request( let matched_route = match server_state.router.at(&request_head.uri.path()) { Ok(m) => m, Err(_) => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter( - vec![], - ) - .into(); + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter(vec![]).into(); return route_1::handler(&allowed_methods).await; } }; let route_id = matched_route.value; #[allow(unused)] - let url_params: pavex::request::route::RawRouteParams<'_, '_> = matched_route - .params - .into(); + let url_params: pavex::request::path::RawPathParams<'_, '_> = matched_route.params.into(); match route_id { - 0u32 => { - match &request_head.method { - &pavex::http::Method::GET => route_0::handler().await, - _ => { - let allowed_methods: pavex::router::AllowedMethods = pavex::router::MethodAllowList::from_iter([ - pavex::http::Method::GET, - ]) - .into(); - route_1::handler(&allowed_methods).await - } + 0u32 => match &request_head.method { + &pavex::http::Method::GET => route_0::handler().await, + _ => { + let allowed_methods: pavex::router::AllowedMethods = + pavex::router::MethodAllowList::from_iter([pavex::http::Method::GET]).into(); + route_1::handler(&allowed_methods).await } - } + }, i => unreachable!("Unknown route id: {}", i), } } @@ -72,9 +64,7 @@ pub mod route_0 { } } pub mod route_1 { - pub async fn handler( - v0: &pavex::router::AllowedMethods, - ) -> pavex::response::Response { + pub async fn handler(v0: &pavex::router::AllowedMethods) -> pavex::response::Response { let v1 = pavex::router::default_fallback(v0).await; ::into_response(v1) } diff --git a/doc_examples/guide/request_data/route_params/project/src/blueprint.rs b/doc_examples/guide/request_data/route_params/project/src/blueprint.rs index e6dd927e3..255fddbd7 100644 --- a/doc_examples/guide/request_data/route_params/project/src/blueprint.rs +++ b/doc_examples/guide/request_data/route_params/project/src/blueprint.rs @@ -1,9 +1,9 @@ use pavex::blueprint::Blueprint; -use pavex::request::route::RouteParams; +use pavex::request::path::PathParams; pub fn blueprint() -> Blueprint { let mut bp = Blueprint::new(); - RouteParams::register(&mut bp); + PathParams::register(&mut bp); bp.nest(crate::route_params::blueprint()); bp } diff --git a/doc_examples/guide/request_data/route_params/project/src/raw_route_params/routes.rs b/doc_examples/guide/request_data/route_params/project/src/raw_route_params/routes.rs index 510ee0b0f..a30c7503a 100644 --- a/doc_examples/guide/request_data/route_params/project/src/raw_route_params/routes.rs +++ b/doc_examples/guide/request_data/route_params/project/src/raw_route_params/routes.rs @@ -1,7 +1,7 @@ use pavex::http::StatusCode; -use pavex::request::route::RawRouteParams; +use pavex::request::path::RawPathParams; -pub fn handler(params: &RawRouteParams) -> StatusCode { +pub fn handler(params: &RawPathParams) -> StatusCode { for (name, value) in params.iter() { println!("`{name}` was set to `{}`", value.as_str()); } diff --git a/doc_examples/guide/request_data/route_params/project/src/route_params/routes.rs b/doc_examples/guide/request_data/route_params/project/src/route_params/routes.rs index 9077fa68b..6dbac002c 100644 --- a/doc_examples/guide/request_data/route_params/project/src/route_params/routes.rs +++ b/doc_examples/guide/request_data/route_params/project/src/route_params/routes.rs @@ -1,12 +1,12 @@ use pavex::http::StatusCode; -use pavex::request::route::RouteParams; +use pavex::request::path::PathParams; -#[RouteParams] +#[PathParams] pub struct GetUserParams { pub id: u64, } -pub fn handler(params: &RouteParams) -> StatusCode { +pub fn handler(params: &PathParams) -> StatusCode { println!("The user id is {}", params.0.id); StatusCode::OK } diff --git a/doc_examples/guide/request_data/wire_data/project/server_sdk/src/lib.rs b/doc_examples/guide/request_data/wire_data/project/server_sdk/src/lib.rs index 001afbed5..60b892a63 100644 --- a/doc_examples/guide/request_data/wire_data/project/server_sdk/src/lib.rs +++ b/doc_examples/guide/request_data/wire_data/project/server_sdk/src/lib.rs @@ -46,7 +46,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 { diff --git a/doc_examples/quickstart/03-route_def.snap b/doc_examples/quickstart/03-route_def.snap index 95fd7c33a..89147da36 100644 --- a/doc_examples/quickstart/03-route_def.snap +++ b/doc_examples/quickstart/03-route_def.snap @@ -1,13 +1,13 @@ ```rust title="demo/src/routes/greet.rs" -use pavex::request::route::RouteParams; +use pavex::request::path::PathParams; use pavex::response::Response; -#[RouteParams] +#[PathParams] pub struct GreetParams { pub name: String, /* (1)! */ } -pub fn greet(params: RouteParams /* (2)! */) -> Response { +pub fn greet(params: PathParams /* (2)! */) -> Response { todo!() } ``` \ No newline at end of file diff --git a/doc_examples/quickstart/03.patch b/doc_examples/quickstart/03.patch index a0e5bd82e..3fd95de0c 100644 --- a/doc_examples/quickstart/03.patch +++ b/doc_examples/quickstart/03.patch @@ -3,15 +3,15 @@ index 38ec1e3..adfbbd5 100644 --- a/demo/src/routes/greet.rs +++ b/demo/src/routes/greet.rs @@ -1,5 +1,11 @@ -+use pavex::request::route::RouteParams; ++use pavex::request::path::PathParams; use pavex::response::Response; -pub fn greet() -> Response { -+#[RouteParams] ++#[PathParams] +pub struct GreetParams { + pub name: String /* (1)! */ +} + -+pub fn greet(params: RouteParams /* (2)! */) -> Response { ++pub fn greet(params: PathParams /* (2)! */) -> Response { todo!() } diff --git a/doc_examples/quickstart/04-route_def.snap b/doc_examples/quickstart/04-route_def.snap index 4e8abe199..29d8163d2 100644 --- a/doc_examples/quickstart/04-route_def.snap +++ b/doc_examples/quickstart/04-route_def.snap @@ -1,13 +1,13 @@ ```rust title="demo/src/routes/greet.rs" -use pavex::request::route::RouteParams; +use pavex::request::path::PathParams; use pavex::response::Response; -#[RouteParams] +#[PathParams] pub struct GreetParams { pub name: String, } -pub fn greet(params: RouteParams) -> Response { +pub fn greet(params: PathParams) -> Response { let GreetParams { name }/* (1)! */ = params.0; Response::ok() // (2)! .set_typed_body(format!("Hello, {name}!")) // (3)! diff --git a/doc_examples/quickstart/04-route_params_constructor.snap b/doc_examples/quickstart/04-route_params_constructor.snap index 8ac0f2a27..748c08058 100644 --- a/doc_examples/quickstart/04-route_params_constructor.snap +++ b/doc_examples/quickstart/04-route_params_constructor.snap @@ -1,7 +1,7 @@ ```rust title="demo/src/blueprint.rs" hl_lines="3" // [...] fn register_common_constructors(bp: &mut Blueprint) { - RouteParams::register(bp); + PathParams::register(bp); // [...] } ``` \ No newline at end of file diff --git a/doc_examples/quickstart/04.patch b/doc_examples/quickstart/04.patch index 0472c280d..77c280078 100644 --- a/doc_examples/quickstart/04.patch +++ b/doc_examples/quickstart/04.patch @@ -4,15 +4,15 @@ index e0be313..5080f53 100644 +++ b/demo/src/routes/greet.rs @@ -3,9 +3,11 @@ use pavex::response::Response; - #[RouteParams] + #[PathParams] pub struct GreetParams { - pub name: String, /* (1)! */ + pub name: String, } --pub fn greet(params: RouteParams /* (2)! */) -> Response { +-pub fn greet(params: PathParams /* (2)! */) -> Response { - todo!() -+pub fn greet(params: RouteParams) -> Response { ++pub fn greet(params: PathParams) -> Response { + let GreetParams { name }/* (1)! */ = params.0; + Response::ok() // (2)! + .set_typed_body(format!("Hello, {name}!")) // (3)! diff --git a/doc_examples/quickstart/05-bis.patch b/doc_examples/quickstart/05-bis.patch index 808ba3faa..c2d3b8da2 100644 --- a/doc_examples/quickstart/05-bis.patch +++ b/doc_examples/quickstart/05-bis.patch @@ -21,8 +21,8 @@ diff --git a/demo/src/routes/greet.rs b/demo/src/routes/greet.rs pub name: String, } --pub fn greet(params: RouteParams, user_agent: UserAgent /* (1)! */) -> Response { -+pub fn greet(params: RouteParams, user_agent: UserAgent) -> Response { +-pub fn greet(params: PathParams, user_agent: UserAgent /* (1)! */) -> Response { ++pub fn greet(params: PathParams, user_agent: UserAgent) -> Response { if let UserAgent::Unknown = user_agent { return Response::unauthorized() .set_typed_body("You must provide a `User-Agent` header"); diff --git a/doc_examples/quickstart/05-error.snap b/doc_examples/quickstart/05-error.snap index 34bc0b86d..ac1b53ccd 100644 --- a/doc_examples/quickstart/05-error.snap +++ b/doc_examples/quickstart/05-error.snap @@ -12,8 +12,8 @@ โ”‚ โ•ฐโ”€โ”€โ”€โ”€ โ”‚ โ•ญโ”€[demo/src/routes/greet.rs:10:1] โ”‚ 10 โ”‚ - โ”‚ 11 โ”‚ pub fn greet(params: RouteParams, user_agent: UserAgent) -> Response { - โ”‚ ยท  โ”€โ”€โ”€โ”€โ”ฌโ”€โ”€โ”€โ”€ + โ”‚ 11 โ”‚ pub fn greet(params: PathParams, user_agent: UserAgent) -> Response { + โ”‚ ยท  โ”€โ”€โ”€โ”€โ”ฌโ”€โ”€โ”€โ”€ โ”‚ ยท I don't know how to construct an instance of this input parameter โ”‚ 12 โ”‚ if let UserAgent::Unknown = user_agent { โ”‚ โ•ฐโ”€โ”€โ”€โ”€ diff --git a/doc_examples/quickstart/05-inject.snap b/doc_examples/quickstart/05-inject.snap index b3d17acea..848d65b81 100644 --- a/doc_examples/quickstart/05-inject.snap +++ b/doc_examples/quickstart/05-inject.snap @@ -2,7 +2,7 @@ // [...] use crate::user_agent::UserAgent; // [...] -pub fn greet(params: RouteParams, user_agent: UserAgent /* (1)! */) -> Response { +pub fn greet(params: PathParams, user_agent: UserAgent /* (1)! */) -> Response { if let UserAgent::Unknown = user_agent { return Response::unauthorized().set_typed_body("You must provide a `User-Agent` header"); } diff --git a/doc_examples/quickstart/05.patch b/doc_examples/quickstart/05.patch index 861051afa..9642aa4bf 100644 --- a/doc_examples/quickstart/05.patch +++ b/doc_examples/quickstart/05.patch @@ -17,21 +17,21 @@ index 5080f53..721ca61 100644 --- a/demo/src/routes/greet.rs +++ b/demo/src/routes/greet.rs @@ -1,13 +1,17 @@ - use pavex::request::route::RouteParams; + use pavex::request::path::PathParams; use pavex::response::Response; +use crate::user_agent::UserAgent; + - #[RouteParams] + #[PathParams] pub struct GreetParams { pub name: String, } --pub fn greet(params: RouteParams) -> Response { +-pub fn greet(params: PathParams) -> Response { - let GreetParams { name }/* (1)! */ = params.0; - Response::ok() // (2)! - .set_typed_body(format!("Hello, {name}!")) // (3)! -+pub fn greet(params: RouteParams, user_agent: UserAgent /* (1)! */) -> Response { ++pub fn greet(params: PathParams, user_agent: UserAgent /* (1)! */) -> Response { + if let UserAgent::Unknown = user_agent { + return Response::unauthorized().set_typed_body("You must provide a `User-Agent` header"); + }