Merge branch 'main' of github.com:sqlpage/sqlx-oldapi

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,12 +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) {
-                    // done with prepare
-                    conn.stream.handle_done(&done);
-                    break;
-                }
+            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) => {
@@ -120,12 +120,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) {
-                        // done with unprepare
-                        conn.stream.handle_done(&done);
-                        break;
-                    }
+                Message::DoneProc(done) | Message::Done(done)
+                    if !done.status.contains(Status::DONE_MORE) =>
+                {
+                    // done with unprepare
+                    conn.stream.handle_done(&done);
+                    break;
                 }
 
                 _ => {}