Merge #1173

1173: build(deps): bump comfy-table to 6.1.1 r=delta1 a=delta1

Supersedes #1172 because it requires Rust 1.62 

Co-authored-by: Byron Hambly <bhambly@blockstream.com>

Cargo.lock

@@ -587,9 +587,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "comfy-table"
-version = "6.1.0"
+version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85914173c2f558d61613bfbbf1911f14e630895087a7ed2fafc0f5319e1536e7"
+checksum = "7b3d16bb3da60be2f7c7acfc438f2ae6f3496897ce68c291d0509bb67b4e248e"
 dependencies = [
  "crossterm",
  "strum",

README.md

@@ -50,7 +50,7 @@ Please have a look at the [contribution guidelines](./CONTRIBUTING.md).
 ## Rust Version Support
 
 Please note that only the latest stable Rust toolchain is supported.
-All stable toolchains since 1.60 _should_ work.
+All stable toolchains since 1.62 _should_ work.
 
 ## Contact
 

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.60"
+channel = "1.62"
 components = ["clippy"]
 targets = ["armv7-unknown-linux-gnueabihf"]

swap/src/asb/event_loop.rs

@@ -176,7 +176,7 @@ where
                             let _ = responder.respond(wallet_snapshot);
                         }
                         SwarmEvent::Behaviour(OutEvent::SwapSetupCompleted{peer_id, swap_id, state3}) => {
-                            let _ = self.handle_execution_setup_done(peer_id, swap_id, state3).await;
+                            self.handle_execution_setup_done(peer_id, swap_id, state3).await;
                         }
                         SwarmEvent::Behaviour(OutEvent::SwapDeclined { peer, error }) => {
                             tracing::warn!(%peer, "Ignoring spot price request: {}", error);

swap/src/protocol/alice/swap.rs

@@ -176,7 +176,7 @@ where
                    }
                 },
                 result = tx_lock_status.wait_until_confirmed_with(state3.cancel_timelock) => {
-                    let _ = result?;
+                    result?;
                     AliceState::CancelTimelockExpired {
                         monero_wallet_restore_blockheight,
                         transfer_proof,
@@ -196,7 +196,7 @@ where
                 biased; // make sure the cancel timelock expiry future is polled first
 
                 result = tx_lock_status.wait_until_confirmed_with(state3.cancel_timelock) => {
-                    let _ = result?;
+                    result?;
                     AliceState::CancelTimelockExpired {
                         monero_wallet_restore_blockheight,
                         transfer_proof,
@@ -326,7 +326,7 @@ where
                     }
                 }
                 result = tx_cancel_status.wait_until_confirmed_with(state3.punish_timelock) => {
-                    let _ = result?;
+                    result?;
 
                     AliceState::BtcPunishable {
                         monero_wallet_restore_blockheight,

swap/src/protocol/bob/swap.rs

@@ -137,7 +137,7 @@ async fn next_state(
                         }
                     },
                     result = cancel_timelock_expires => {
-                        let _ = result?;
+                        result?;
                         tracing::info!("Alice took too long to lock Monero, cancelling the swap");
 
                         let state4 = state3.cancel();
@@ -174,7 +174,7 @@ async fn next_state(
                         }
                     }
                     result = tx_lock_status.wait_until_confirmed_with(state.cancel_timelock) => {
-                        let _ = result?;
+                        result?;
                         BobState::CancelTimelockExpired(state.cancel())
                     }
                 }
@@ -198,7 +198,7 @@ async fn next_state(
                         }
                     },
                     result = tx_lock_status.wait_until_confirmed_with(state.cancel_timelock) => {
-                        let _ = result?;
+                        result?;
                         BobState::CancelTimelockExpired(state.cancel())
                     }
                 }
@@ -215,7 +215,7 @@ async fn next_state(
                         BobState::BtcRedeemed(state5?)
                     },
                     result = tx_lock_status.wait_until_confirmed_with(state.cancel_timelock) => {
-                        let _ = result?;
+                        result?;
                         BobState::CancelTimelockExpired(state.cancel())
                     }
                 }