From bb2799e579a386956098ab39cb24d51dc5bc71ae Mon Sep 17 00:00:00 2001 From: nazeh Date: Mon, 25 Nov 2024 18:31:00 +0300 Subject: [PATCH] fix: clippy --- pubky-homeserver/src/extractors.rs | 2 +- pubky/src/native.rs | 32 +++++++++++++----------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/pubky-homeserver/src/extractors.rs b/pubky-homeserver/src/extractors.rs index 29ff058..35fd691 100644 --- a/pubky-homeserver/src/extractors.rs +++ b/pubky-homeserver/src/extractors.rs @@ -66,7 +66,7 @@ impl EntryPath { impl std::fmt::Display for EntryPath { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "{}", &self) + write!(f, "{}", self.0) } } diff --git a/pubky/src/native.rs b/pubky/src/native.rs index e85d110..6063235 100644 --- a/pubky/src/native.rs +++ b/pubky/src/native.rs @@ -108,22 +108,20 @@ pub struct CookieJar { impl CookieJar { pub(crate) fn store_session_after_signup(&self, response: &Response, pubky: PublicKey) { for (header_name, header_value) in response.headers() { - if header_name == "set-cookie" { - if header_value.as_ref().starts_with(b"session_id=") { - if let Ok(Ok(cookie)) = - std::str::from_utf8(header_value.as_bytes()).map(cookie::Cookie::parse) - { - if cookie.name() == "session_id" { - let domain = format!("_pubky.{pubky}"); - tracing::debug!(?cookie, "Storing coookie after signup"); + if header_name == "set-cookie" && header_value.as_ref().starts_with(b"session_id=") { + if let Ok(Ok(cookie)) = + std::str::from_utf8(header_value.as_bytes()).map(cookie::Cookie::parse) + { + if cookie.name() == "session_id" { + let domain = format!("_pubky.{pubky}"); + tracing::debug!(?cookie, "Storing coookie after signup"); - self.pubky_sessions - .write() - .unwrap() - .insert(domain, cookie.value().to_string()); - } - }; - } + self.pubky_sessions + .write() + .unwrap() + .insert(domain, cookie.value().to_string()); + } + }; } } } @@ -166,9 +164,7 @@ impl CookieStore for CookieJar { .read() .unwrap() .get(url.host_str().unwrap()) - .and_then(|secret| { - Some(HeaderValue::try_from(format!("session_id={secret}")).unwrap()) - }); + .map(|secret| HeaderValue::try_from(format!("session_id={secret}")).unwrap()); } HeaderValue::from_maybe_shared(bytes::Bytes::from(s)).ok()