chore: apply beta clippy fixes

link2xt · link2xt · commit 81ec8ee39547 · 2025-05-20T13:57:41.000Z
diff --git a/src/client.rs b/src/client.rs
@@ -188,7 +188,7 @@ impl<T: Read + Write + Unpin + fmt::Debug + Send> Client<T> {
         let u = ok_or_unauth_client_err!(validate_str(username.as_ref()), self);
         let p = ok_or_unauth_client_err!(validate_str(password.as_ref()), self);
         ok_or_unauth_client_err!(
-            self.run_command_and_check_ok(&format!("LOGIN {} {}", u, p), None)
+            self.run_command_and_check_ok(&format!("LOGIN {u} {p}"), None)
                 .await,
             self
         );
@@ -1454,17 +1454,10 @@ impl<T: Read + Write + Unpin + fmt::Debug> Connection<T> {
         use imap_proto::Status;
         match status {
             Status::Ok => Ok(()),
-            Status::Bad => Err(Error::Bad(format!(
-                "code: {:?}, info: {:?}",
-                code, information
-            ))),
-            Status::No => Err(Error::No(format!(
-                "code: {:?}, info: {:?}",
-                code, information
-            ))),
+            Status::Bad => Err(Error::Bad(format!("code: {code:?}, info: {information:?}"))),
+            Status::No => Err(Error::No(format!("code: {code:?}, info: {information:?}"))),
             _ => Err(Error::Io(io::Error::other(format!(
-                "status: {:?}, code: {:?}, information: {:?}",
-                status, code, information
+                "status: {status:?}, code: {code:?}, information: {information:?}"
             )))),
         }
     }
@@ -2155,7 +2148,7 @@ mod tests {
         K: 'a + Future<Output = Result<T>>,
     {
         let resp = res.as_bytes().to_vec();
-        let line = format!("A0001{}{} {} {}\r\n", prefix, cmd, seq, query);
+        let line = format!("A0001{prefix}{cmd} {seq} {query}\r\n");
         let session = Arc::new(Mutex::new(mock_session!(MockStream::new(resp))));
 
         {
@@ -2193,7 +2186,7 @@ mod tests {
                     return;
                 }
             }
-            panic!("Wrong error: {:?}", e);
+            panic!("Wrong error: {e:?}");
         }
         panic!("No error");
     }
@@ -2207,7 +2200,7 @@ mod tests {
                     return;
                 }
             }
-            panic!("Wrong error: {:?}", e);
+            panic!("Wrong error: {e:?}");
         }
         panic!("No error");
     }
diff --git a/src/imap_stream.rs b/src/imap_stream.rs
@@ -91,7 +91,7 @@ impl<R: Read + Write + Unpin> ImapStream<R> {
                     Ok(response)
                 }
                 Err(nom::Err::Incomplete(Needed::Size(min))) => {
-                    log::trace!("decode: incomplete data, need minimum {} bytes", min);
+                    log::trace!("decode: incomplete data, need minimum {min} bytes");
                     self.decode_needs = self.buffer.used() + usize::from(min);
                     Err(None)
                 }
diff --git a/src/mock_stream.rs b/src/mock_stream.rs
@@ -103,7 +103,7 @@ impl Read for MockStream {
             return Poll::Ready(Ok(0));
         }
         if self.err_on_read {
-            return Poll::Ready(Err(Error::new(ErrorKind::Other, "MockStream Error")));
+            return Poll::Ready(Err(Error::other("MockStream Error")));
         }
         if self.read_pos >= self.read_buf.len() {
             return Poll::Ready(Err(Error::new(ErrorKind::UnexpectedEof, "EOF")));
diff --git a/src/parse.rs b/src/parse.rs
@@ -115,21 +115,14 @@ pub(crate) async fn parse_status<T: Stream<Item = io::Result<ResponseData>> + Un
                         break;
                     }
                     Status::Bad => {
-                        return Err(Error::Bad(format!(
-                            "code: {:?}, info: {:?}",
-                            code, information
-                        )))
+                        return Err(Error::Bad(format!("code: {code:?}, info: {information:?}")))
                     }
                     Status::No => {
-                        return Err(Error::No(format!(
-                            "code: {:?}, info: {:?}",
-                            code, information
-                        )))
+                        return Err(Error::No(format!("code: {code:?}, info: {information:?}")))
                     }
                     _ => {
                         return Err(Error::Io(io::Error::other(format!(
-                            "status: {:?}, code: {:?}, information: {:?}",
-                            status, code, information
+                            "status: {status:?}, code: {code:?}, information: {information:?}"
                         ))));
                     }
                 }
@@ -258,21 +251,14 @@ pub(crate) async fn parse_mailbox<T: Stream<Item = io::Result<ResponseData>> + U
                         break;
                     }
                     Status::Bad => {
-                        return Err(Error::Bad(format!(
-                            "code: {:?}, info: {:?}",
-                            code, information
-                        )))
+                        return Err(Error::Bad(format!("code: {code:?}, info: {information:?}")))
                     }
                     Status::No => {
-                        return Err(Error::No(format!(
-                            "code: {:?}, info: {:?}",
-                            code, information
-                        )))
+                        return Err(Error::No(format!("code: {code:?}, info: {information:?}")))
                     }
                     _ => {
                         return Err(Error::Io(io::Error::other(format!(
-                            "status: {:?}, code: {:?}, information: {:?}",
-                            status, code, information
+                            "status: {status:?}, code: {code:?}, information: {information:?}"
                         ))));
                     }
                 }
@@ -309,21 +295,14 @@ pub(crate) async fn parse_mailbox<T: Stream<Item = io::Result<ResponseData>> + U
                         }
                     }
                     Status::Bad => {
-                        return Err(Error::Bad(format!(
-                            "code: {:?}, info: {:?}",
-                            code, information
-                        )))
+                        return Err(Error::Bad(format!("code: {code:?}, info: {information:?}")))
                     }
                     Status::No => {
-                        return Err(Error::No(format!(
-                            "code: {:?}, info: {:?}",
-                            code, information
-                        )))
+                        return Err(Error::No(format!("code: {code:?}, info: {information:?}")))
                     }
                     _ => {
                         return Err(Error::Io(io::Error::other(format!(
-                            "status: {:?}, code: {:?}, information: {:?}",
-                            status, code, information
+                            "status: {status:?}, code: {code:?}, information: {information:?}"
                         ))));
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ impl<T: Read + Write + Unpin + fmt::Debug + Send> Client<T> {`
`188`	`188`	`let u = ok_or_unauth_client_err!(validate_str(username.as_ref()), self);`
`189`	`189`	`let p = ok_or_unauth_client_err!(validate_str(password.as_ref()), self);`
`190`	`190`	`ok_or_unauth_client_err!(`
`191`		`- self.run_command_and_check_ok(&format!("LOGIN {} {}", u, p), None)`
	`191`	`+ self.run_command_and_check_ok(&format!("LOGIN {u} {p}"), None)`
`192`	`192`	`.await,`
`193`	`193`	`self`
`194`	`194`	`);`
`@@ -1454,17 +1454,10 @@ impl<T: Read + Write + Unpin + fmt::Debug> Connection<T> {`
`1454`	`1454`	`use imap_proto::Status;`
`1455`	`1455`	`match status {`
`1456`	`1456`	`Status::Ok => Ok(()),`
`1457`		`- Status::Bad => Err(Error::Bad(format!(`
`1458`		`- "code: {:?}, info: {:?}",`
`1459`		`- code, information`
`1460`		`- ))),`
`1461`		`- Status::No => Err(Error::No(format!(`
`1462`		`- "code: {:?}, info: {:?}",`
`1463`		`- code, information`
`1464`		`- ))),`
	`1457`	`+ Status::Bad => Err(Error::Bad(format!("code: {code:?}, info: {information:?}"))),`
	`1458`	`+ Status::No => Err(Error::No(format!("code: {code:?}, info: {information:?}"))),`
`1465`	`1459`	`_ => Err(Error::Io(io::Error::other(format!(`
`1466`		`- "status: {:?}, code: {:?}, information: {:?}",`
`1467`		`- status, code, information`
	`1460`	`+ "status: {status:?}, code: {code:?}, information: {information:?}"`
`1468`	`1461`	`)))),`
`1469`	`1462`	`}`
`1470`	`1463`	`}`
`@@ -2155,7 +2148,7 @@ mod tests {`
`2155`	`2148`	`K: 'a + Future<Output = Result<T>>,`
`2156`	`2149`	`{`
`2157`	`2150`	`let resp = res.as_bytes().to_vec();`
`2158`		`- let line = format!("A0001{}{} {} {}\r\n", prefix, cmd, seq, query);`
	`2151`	`+ let line = format!("A0001{prefix}{cmd} {seq} {query}\r\n");`
`2159`	`2152`	`let session = Arc::new(Mutex::new(mock_session!(MockStream::new(resp))));`
`2160`	`2153`
`2161`	`2154`	`{`
`@@ -2193,7 +2186,7 @@ mod tests {`
`2193`	`2186`	`return;`
`2194`	`2187`	`}`
`2195`	`2188`	`}`
`2196`		`- panic!("Wrong error: {:?}", e);`
	`2189`	`+ panic!("Wrong error: {e:?}");`
`2197`	`2190`	`}`
`2198`	`2191`	`panic!("No error");`
`2199`	`2192`	`}`
`@@ -2207,7 +2200,7 @@ mod tests {`
`2207`	`2200`	`return;`
`2208`	`2201`	`}`
`2209`	`2202`	`}`
`2210`		`- panic!("Wrong error: {:?}", e);`
	`2203`	`+ panic!("Wrong error: {e:?}");`
`2211`	`2204`	`}`
`2212`	`2205`	`panic!("No error");`
`2213`	`2206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ impl<R: Read + Write + Unpin> ImapStream<R> {`
`91`	`91`	`Ok(response)`
`92`	`92`	`}`
`93`	`93`	`Err(nom::Err::Incomplete(Needed::Size(min))) => {`
`94`		`- log::trace!("decode: incomplete data, need minimum {} bytes", min);`
	`94`	`+ log::trace!("decode: incomplete data, need minimum {min} bytes");`
`95`	`95`	`self.decode_needs = self.buffer.used() + usize::from(min);`
`96`	`96`	`Err(None)`
`97`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ impl Read for MockStream {`
`103`	`103`	`return Poll::Ready(Ok(0));`
`104`	`104`	`}`
`105`	`105`	`if self.err_on_read {`
`106`		`- return Poll::Ready(Err(Error::new(ErrorKind::Other, "MockStream Error")));`
	`106`	`+ return Poll::Ready(Err(Error::other("MockStream Error")));`
`107`	`107`	`}`
`108`	`108`	`if self.read_pos >= self.read_buf.len() {`
`109`	`109`	`return Poll::Ready(Err(Error::new(ErrorKind::UnexpectedEof, "EOF")));`
Original file line number	Diff line number	Diff line change
`@@ -115,21 +115,14 @@ pub(crate) async fn parse_status<T: Stream<Item = io::Result<ResponseData>> + Un`
`115`	`115`	`break;`
`116`	`116`	`}`
`117`	`117`	`Status::Bad => {`
`118`		`- return Err(Error::Bad(format!(`
`119`		`- "code: {:?}, info: {:?}",`
`120`		`- code, information`
`121`		`- )))`
	`118`	`+ return Err(Error::Bad(format!("code: {code:?}, info: {information:?}")))`
`122`	`119`	`}`
`123`	`120`	`Status::No => {`
`124`		`- return Err(Error::No(format!(`
`125`		`- "code: {:?}, info: {:?}",`
`126`		`- code, information`
`127`		`- )))`
	`121`	`+ return Err(Error::No(format!("code: {code:?}, info: {information:?}")))`
`128`	`122`	`}`
`129`	`123`	`_ => {`
`130`	`124`	`return Err(Error::Io(io::Error::other(format!(`
`131`		`- "status: {:?}, code: {:?}, information: {:?}",`
`132`		`- status, code, information`
	`125`	`+ "status: {status:?}, code: {code:?}, information: {information:?}"`
`133`	`126`	`))));`
`134`	`127`	`}`
`135`	`128`	`}`
`@@ -258,21 +251,14 @@ pub(crate) async fn parse_mailbox<T: Stream<Item = io::Result<ResponseData>> + U`
`258`	`251`	`break;`
`259`	`252`	`}`
`260`	`253`	`Status::Bad => {`
`261`		`- return Err(Error::Bad(format!(`
`262`		`- "code: {:?}, info: {:?}",`
`263`		`- code, information`
`264`		`- )))`
	`254`	`+ return Err(Error::Bad(format!("code: {code:?}, info: {information:?}")))`
`265`	`255`	`}`
`266`	`256`	`Status::No => {`
`267`		`- return Err(Error::No(format!(`
`268`		`- "code: {:?}, info: {:?}",`
`269`		`- code, information`
`270`		`- )))`
	`257`	`+ return Err(Error::No(format!("code: {code:?}, info: {information:?}")))`
`271`	`258`	`}`
`272`	`259`	`_ => {`
`273`	`260`	`return Err(Error::Io(io::Error::other(format!(`
`274`		`- "status: {:?}, code: {:?}, information: {:?}",`
`275`		`- status, code, information`
	`261`	`+ "status: {status:?}, code: {code:?}, information: {information:?}"`
`276`	`262`	`))));`
`277`	`263`	`}`
`278`	`264`	`}`
`@@ -309,21 +295,14 @@ pub(crate) async fn parse_mailbox<T: Stream<Item = io::Result<ResponseData>> + U`
`309`	`295`	`}`
`310`	`296`	`}`
`311`	`297`	`Status::Bad => {`
`312`		`- return Err(Error::Bad(format!(`
`313`		`- "code: {:?}, info: {:?}",`
`314`		`- code, information`
`315`		`- )))`
	`298`	`+ return Err(Error::Bad(format!("code: {code:?}, info: {information:?}")))`
`316`	`299`	`}`
`317`	`300`	`Status::No => {`
`318`		`- return Err(Error::No(format!(`
`319`		`- "code: {:?}, info: {:?}",`
`320`		`- code, information`
`321`		`- )))`
	`301`	`+ return Err(Error::No(format!("code: {code:?}, info: {information:?}")))`
`322`	`302`	`}`
`323`	`303`	`_ => {`
`324`	`304`	`return Err(Error::Io(io::Error::other(format!(`
`325`		`- "status: {:?}, code: {:?}, information: {:?}",`
`326`		`- status, code, information`
	`305`	`+ "status: {status:?}, code: {code:?}, information: {information:?}"`
`327`	`306`	`))));`
`328`	`307`	`}`
`329`	`308`	`}`