fix merge conflict

Author: joeydewaal

sqlx-postgres/src/connection/mod.rs

@@ -185,14 +185,14 @@ impl Connection for PgConnection {
 
         self.wait_until_ready().await?;
 
-            while let Some((id, _)) = self.inner.cache_statement.remove_lru() {
-                self.inner.stream.write_msg(Close::Statement(id))?;
-                cleared += 1;
-            }
+        while let Some((id, _)) = self.inner.cache_statement.remove_lru() {
+            self.inner.stream.write_msg(Close::Statement(id))?;
+            cleared += 1;
+        }
 
-            if cleared > 0 {
-                self.write_sync();
-                self.inner.stream.flush().await?;
+        if cleared > 0 {
+            self.write_sync();
+            self.inner.stream.flush().await?;
 
             self.wait_for_close_complete(cleared).await?;
             self.recv_ready_for_query().await?;

sqlx-postgres/src/transaction.rs

@@ -35,8 +35,10 @@ impl TransactionManager for PgTransactionManager {
 
     async fn rollback(conn: &mut PgConnection) -> Result<(), Error> {
         if conn.inner.transaction_depth > 0 {
-            conn.execute(&*rollback_ansi_transaction_sql(conn.inner.transaction_depth))
-                .await?;
+            conn.execute(&*rollback_ansi_transaction_sql(
+                conn.inner.transaction_depth,
+            ))
+            .await?;
 
             conn.inner.transaction_depth -= 1;
         }