diff options
Diffstat (limited to 'src/context')
| -rw-r--r-- | src/context/error.rs | 18 | ||||
| -rw-r--r-- | src/context/hook.rs | 17 | ||||
| -rw-r--r-- | src/context/route.rs | 18 |
3 files changed, 21 insertions, 32 deletions
diff --git a/src/context/error.rs b/src/context/error.rs index eb1e00e..a9a4b85 100644 --- a/src/context/error.rs +++ b/src/context/error.rs @@ -17,24 +17,18 @@ // SPDX-License-Identifier: GPL-3.0-only use openssl::x509::X509; -use tokio::net::TcpStream; use url::Url; #[allow(clippy::module_name_repetitions)] -pub struct ErrorContext<'a> { - pub tcp: &'a TcpStream, - pub url: &'a Url, - pub certificate: &'a Option<X509>, +pub struct ErrorContext { + pub url: Url, + pub certificate: Option<X509>, } -impl<'a> ErrorContext<'a> { - pub const fn new( - tcp: &'a TcpStream, - url: &'a Url, - certificate: &'a Option<X509>, - ) -> Self { +impl ErrorContext { + #[must_use] + pub const fn new(url: Url, certificate: Option<X509>) -> Self { Self { - tcp, url, certificate, } diff --git a/src/context/hook.rs b/src/context/hook.rs index 44804fa..736696f 100644 --- a/src/context/hook.rs +++ b/src/context/hook.rs @@ -18,26 +18,23 @@ use matchit::Params; use openssl::x509::X509; -use tokio::net::TcpStream; use url::Url; #[allow(clippy::module_name_repetitions)] pub struct HookContext<'a> { - pub tcp: &'a TcpStream, - pub url: &'a Url, - pub params: Option<&'a Params<'a, 'a>>, - pub certificate: &'a Option<X509>, + pub url: Url, + pub params: Option<Params<'a, 'a>>, + pub certificate: Option<X509>, } impl<'a> HookContext<'a> { + #[must_use] pub const fn new( - tcp: &'a TcpStream, - url: &'a Url, - params: Option<&'a Params<'a, 'a>>, - certificate: &'a Option<X509>, + url: Url, + params: Option<Params<'a, 'a>>, + certificate: Option<X509>, ) -> Self { Self { - tcp, url, params, certificate, diff --git a/src/context/route.rs b/src/context/route.rs index 61eca0c..b3b105d 100644 --- a/src/context/route.rs +++ b/src/context/route.rs @@ -18,26 +18,24 @@ use matchit::Params; use openssl::x509::X509; -use tokio::net::TcpStream; use url::Url; #[allow(clippy::module_name_repetitions)] +#[derive(Clone)] pub struct RouteContext<'a> { - pub tcp: &'a TcpStream, - pub url: &'a Url, - pub params: &'a Params<'a, 'a>, - pub certificate: &'a Option<X509>, + pub url: Url, + pub params: Params<'a, 'a>, + pub certificate: Option<X509>, } impl<'a> RouteContext<'a> { + #[must_use] pub const fn new( - tcp: &'a TcpStream, - url: &'a Url, - params: &'a Params<'a, 'a>, - certificate: &'a Option<X509>, + url: Url, + params: Params<'a, 'a>, + certificate: Option<X509>, ) -> Self { Self { - tcp, url, params, certificate, |