clippy

Author: lovasoa

sqlx-core/src/mssql/connection/executor.rs

@@ -117,15 +117,14 @@ impl<'c> Executor<'c> for &'c mut MssqlConnection {
                         }
                     }
 
-                    Message::DoneInProc(done) => {
-                        if done.status.contains(Status::DONE_COUNT) {
+                    Message::DoneInProc(done)
+                        if done.status.contains(Status::DONE_COUNT) => {
                             let rows_affected = done.affected_rows;
                             logger.increase_rows_affected(rows_affected);
                             r#yield!(Either::Left(MssqlQueryResult {
                                 rows_affected,
                             }));
                         }
-                    }
 
                     _ => {}
                 }

sqlx-core/src/mssql/connection/prepare.rs

@@ -77,13 +77,12 @@ pub(crate) async fn prepare(
         let message = conn.stream.recv_message().await?;
 
         match message {
-            Message::DoneProc(done) | Message::Done(done) => {
-                if !done.status.contains(Status::DONE_MORE) {
+            Message::DoneProc(done) | Message::Done(done)
+                if !done.status.contains(Status::DONE_MORE) => {
                     // done with prepare
                     conn.stream.handle_done(&done);
                     break;
                 }
-            }
 
             Message::ReturnValue(rv) => {
                 id = <i32 as Decode<Mssql>>::decode(MssqlValueRef {
@@ -120,13 +119,12 @@ pub(crate) async fn prepare(
             let message = conn.stream.recv_message().await?;
 
             match message {
-                Message::DoneProc(done) | Message::Done(done) => {
-                    if !done.status.contains(Status::DONE_MORE) {
+                Message::DoneProc(done) | Message::Done(done)
+                    if !done.status.contains(Status::DONE_MORE) => {
                         // done with unprepare
                         conn.stream.handle_done(&done);
                         break;
                     }
-                }
 
                 _ => {}
             }

tests/odbc/odbc.rs

@@ -561,7 +561,7 @@ where
     use sqlx_oldapi::odbc::OdbcConnectOptions;
 
     for &buf_settings in buffer_settings {
-        let database_url = std::env::var("DATABASE_URL").unwrap();
+        let database_url = std::env::var("DATABASE_URL")?;
         let mut opts = OdbcConnectOptions::from_str(&database_url)?;
         opts.buffer_settings(buf_settings);
 
@@ -658,7 +658,6 @@ async fn it_handles_mixed_null_and_values() -> anyhow::Result<()> {
         .fetch_all(&mut conn)
         .await?;
 
-    dbg!(&rows);
     assert_eq!(rows.len(), 2, "should have 2 rows");
     assert_eq!(rows[0].get::<Option<i32>, _>(0), Some(42));
     assert_eq!(rows[0].get::<Option<i32>, _>(1), None);