From 68e789412597f94e81aaa882cf0cd81b2608167a Mon Sep 17 00:00:00 2001 From: yggverse Date: Mon, 24 Mar 2025 07:10:22 +0200 Subject: [PATCH] apply clippy --- src/client/connection/response/success.rs | 4 ++-- src/client/connection/response/success/default.rs | 2 +- src/client/connection/response/success/default/header.rs | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/client/connection/response/success.rs b/src/client/connection/response/success.rs index 591510d..6ead866 100644 --- a/src/client/connection/response/success.rs +++ b/src/client/connection/response/success.rs @@ -16,10 +16,10 @@ impl Success { /// Parse new `Self` from buffer bytes pub fn parse(buffer: &[u8]) -> Result { - if !buffer.first().is_some_and(|b| *b == CODE) { + if buffer.first().is_none_or(|b| *b != CODE) { return Err(Error::Code); } - match Default::parse(&buffer) { + match Default::parse(buffer) { Ok(default) => Ok(Self::Default(default)), Err(e) => Err(Error::Default(e)), } diff --git a/src/client/connection/response/success/default.rs b/src/client/connection/response/success/default.rs index 34f9cb0..90ac8f5 100644 --- a/src/client/connection/response/success/default.rs +++ b/src/client/connection/response/success/default.rs @@ -18,7 +18,7 @@ impl Default { if !buffer.starts_with(CODE) { return Err(Error::Code); } - let header = Header::parse(buffer).map_err(|e| Error::Header(e))?; + let header = Header::parse(buffer).map_err(Error::Header)?; Ok(Self { content: buffer.get(header.len() + 1..).map(|v| v.to_vec()), header, diff --git a/src/client/connection/response/success/default/header.rs b/src/client/connection/response/success/default/header.rs index ef326bc..306a984 100644 --- a/src/client/connection/response/success/default/header.rs +++ b/src/client/connection/response/success/default/header.rs @@ -12,7 +12,7 @@ impl Header { } Ok(Self( crate::client::connection::response::header_bytes(buffer) - .map_err(|e| Error::Header(e))? + .map_err(Error::Header)? .to_vec(), )) } @@ -23,7 +23,7 @@ impl Header { pub fn mime(&self) -> Result { glib::Regex::split_simple( r"^\d{2}\s([^\/]+\/[^\s;]+)", - std::str::from_utf8(&self.0).map_err(|e| Error::Utf8Error(e))?, + std::str::from_utf8(&self.0).map_err(Error::Utf8Error)?, glib::RegexCompileFlags::DEFAULT, glib::RegexMatchFlags::DEFAULT, ) @@ -37,6 +37,10 @@ impl Header { self.0.len() } + pub fn is_empty(&self) -> bool { + self.0.is_empty() + } + pub fn as_bytes(&self) -> &[u8] { &self.0 }