diff options
| -rw-r--r-- | examples/windmark.rs | 9 | ||||
| -rw-r--r-- | src/context/hook.rs | 7 | ||||
| -rw-r--r-- | src/context/route.rs | 6 |
3 files changed, 12 insertions, 10 deletions
diff --git a/examples/windmark.rs b/examples/windmark.rs index 677a694..e7e0a5c 100644 --- a/examples/windmark.rs +++ b/examples/windmark.rs @@ -133,7 +133,10 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { "/param/:lang", success!( context, - format!("Parameter lang is {}", context.params.get("lang").unwrap()) + format!( + "Parameter lang is {}", + context.parameters.get("lang").unwrap() + ) ), ); router.mount( @@ -142,8 +145,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { context, format!( "{} {}", - context.params.get("first").unwrap(), - context.params.get("last").unwrap() + context.parameters.get("first").unwrap(), + context.parameters.get("last").unwrap() ) ), ); diff --git a/src/context/hook.rs b/src/context/hook.rs index 04ac816..b7fb4ec 100644 --- a/src/context/hook.rs +++ b/src/context/hook.rs @@ -27,7 +27,7 @@ use url::Url; pub struct HookContext { pub peer_address: Option<std::net::SocketAddr>, pub url: Url, - pub params: Option<HashMap<String, String>>, + pub parameters: Option<HashMap<String, String>>, pub certificate: Option<X509>, } @@ -36,14 +36,13 @@ impl HookContext { pub fn new( peer_address: std::io::Result<std::net::SocketAddr>, url: Url, - params: Option<Params<'_, '_>>, + parameters: Option<Params<'_, '_>>, certificate: Option<X509>, ) -> Self { Self { peer_address: peer_address.ok(), url, - params: params - .map(|parameters| crate::utilities::params_to_hashmap(¶meters)), + parameters: parameters.map(|p| crate::utilities::params_to_hashmap(&p)), certificate, } } diff --git a/src/context/route.rs b/src/context/route.rs index a39ad0b..d1b86a6 100644 --- a/src/context/route.rs +++ b/src/context/route.rs @@ -27,7 +27,7 @@ use url::Url; pub struct RouteContext { pub peer_address: Option<std::net::SocketAddr>, pub url: Url, - pub params: HashMap<String, String>, + pub parameters: HashMap<String, String>, pub certificate: Option<X509>, } @@ -36,13 +36,13 @@ impl RouteContext { pub fn new( peer_address: std::io::Result<std::net::SocketAddr>, url: Url, - params: &Params<'_, '_>, + parameters: &Params<'_, '_>, certificate: Option<X509>, ) -> Self { Self { peer_address: peer_address.ok(), url, - params: crate::utilities::params_to_hashmap(params), + parameters: crate::utilities::params_to_hashmap(parameters), certificate, } } |