diff --git a/core/codegen/src/attribute/route/mod.rs b/core/codegen/src/attribute/route/mod.rs index b2979d3fac..506102499c 100644 --- a/core/codegen/src/attribute/route/mod.rs +++ b/core/codegen/src/attribute/route/mod.rs @@ -266,12 +266,8 @@ fn internal_uri_macro_decl(route: &Route) -> TokenStream { route.attr.method.as_ref().map(|m| m.0.hash(&mut hasher)); route.attr.uri.path().hash(&mut hasher); route.attr.uri.query().hash(&mut hasher); - if let Some(data) = &route.attr.data { - data.value.hash(&mut hasher); - } - if let Some(format) = &route.attr.format { - format.0.hash(&mut hasher); - } + route.attr.data.as_ref().map(|d| d.value.hash(&mut hasher)); + route.attr.format.as_ref().map(|f| f.0.hash(&mut hasher)); }); let route_uri = route.attr.uri.to_string(); diff --git a/core/lib/Cargo.toml b/core/lib/Cargo.toml index 0ce5f3a854..a2ed3b40dc 100644 --- a/core/lib/Cargo.toml +++ b/core/lib/Cargo.toml @@ -121,14 +121,14 @@ version = "2.1.0" optional = true [dependencies.s2n-quic] -version = "1.36" +version = "1.51" default-features = false features = ["provider-address-token-default", "provider-tls-rustls"] optional = true [dependencies.s2n-quic-h3] git = "https://github.com/SergioBenitez/s2n-quic-h3.git" -rev = "6613956" +rev = "f832471" optional = true [target.'cfg(unix)'.dependencies] diff --git a/core/lib/src/request/from_param.rs b/core/lib/src/request/from_param.rs index f639d38efb..ac701eb8f2 100644 --- a/core/lib/src/request/from_param.rs +++ b/core/lib/src/request/from_param.rs @@ -39,7 +39,7 @@ use crate::http::uri::{Segments, error::PathError, fmt::Path}; /// If `usize::from_param` returns an `Ok(usize)` variant, the encapsulated /// value is used as the `id` function parameter. If not, the request is /// forwarded to the next matching route. Since there are no additional matching -/// routes, this example will result in a 404 error for requests with invalid +/// routes, this example will result in a 422 error for requests with invalid /// `id` values. /// /// # Catching Errors