Apply clippy suggestions

verdiwm · Nov 21, 2024 · 8e023ce · 8e023ce
1 parent 8e7d8d7
commit 8e023ce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/wire/message.rs b/src/wire/message.rs
@@ -106,7 +106,7 @@ impl Message {
     pub fn string(&mut self) -> Result<Option<String>, DecodeError> {
         let mut array = self.array()?;
 
-        if array.len() == 0 {
+        if array.is_empty() {
             return Ok(None);
         }
 

diff --git a/src/wire/payload.rs b/src/wire/payload.rs
@@ -11,6 +11,12 @@ pub struct PayloadBuilder {
     fds: Vec<RawFd>,
 }
 
+impl Default for PayloadBuilder {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl PayloadBuilder {
     pub fn new() -> Self {
         Self {

diff --git a/src/wire/socket.rs b/src/wire/socket.rs
@@ -139,10 +139,9 @@ impl Stream for Socket {
                     let frame = pinned
                         .codec
                         .decode_eof(&mut state.buffer, &mut state.fds)
-                        .map_err(|err| {
+                        .inspect_err(|err| {
                             trace!("Got an error, going to errored state");
                             state.has_errored = true;
-                            err
                         })?;
                     if frame.is_none() {
                         state.is_readable = false; // prepare pausing -> paused
@@ -157,10 +156,9 @@ impl Stream for Socket {
                 if let Some(frame) = pinned
                     .codec
                     .decode(&mut state.buffer, &mut state.fds)
-                    .map_err(|op| {
+                    .inspect_err(|op| {
                         trace!("Got an error, going to errored state");
                         state.has_errored = true;
-                        op
                     })?
                 {
                     trace!("frame decoded from buffer");
@@ -269,8 +267,7 @@ impl Sink<Message> for Socket {
                             io::ErrorKind::WriteZero,
                             "failed to \
                      write frame to transport",
-                        )
-                        .into()));
+                        )));
                     }
 
                     return Poll::Ready(Ok(()));