Fix Clippy warnings on Rust 1.72

informalsystems · Aug 25, 2023 · 00b8645 · 00b8645
1 parent 2af08a8
commit 00b8645
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/crates/relayer-cli/src/commands/tx/channel.rs b/crates/relayer-cli/src/commands/tx/channel.rs
@@ -38,6 +38,7 @@ macro_rules! tx_chan_cmd {
             Err(e) => Output::error(format!("{}", e)).exit(),
         };
 
+        #[allow(clippy::redundant_closure_call)]
         let channel = $chan(chains, dst_connection);
 
         info!("message {}: {}", $dbg_string, channel);

diff --git a/crates/relayer-cli/src/commands/tx/connection.rs b/crates/relayer-cli/src/commands/tx/connection.rs
@@ -21,6 +21,7 @@ macro_rules! conn_open_cmd {
             Err(e) => Output::error(format!("{}", e)).exit(),
         };
 
+        #[allow(clippy::redundant_closure_call)]
         let connection = $conn(chains);
 
         debug!("message {}: {:?}", $dbg_string, connection);

diff --git a/crates/relayer/src/chain.rs b/crates/relayer/src/chain.rs
@@ -60,6 +60,6 @@ mod tests {
 
         // NOTE(new): Add tests here
 
-        assert!(matches!(parse("hello-world"), Err(_)));
+        assert!(parse("hello-world").is_err());
     }
 }
diff --git a/crates/relayer/src/chain/cosmos.rs b/crates/relayer/src/chain/cosmos.rs
@@ -569,7 +569,6 @@ impl CosmosSdkChain {
         ))?;
 
         // TODO - Verify response proof, if requested.
-        if prove {}
 
         Ok(response)
     }

diff --git a/crates/relayer/src/error.rs b/crates/relayer/src/error.rs
@@ -689,9 +689,8 @@ impl GrpcStatusSubdetail {
 /// "account sequence mismatch, expected E, got G".
 /// If a match is found it extracts and returns (E, G).
 fn parse_sequences_in_mismatch_error_message(message: &str) -> Option<(u64, u64)> {
-    let re =
-        Regex::new(r#"account sequence mismatch, expected (?P<expected>\d+), got (?P<got>\d+)"#)
-            .unwrap();
+    let re = Regex::new(r"account sequence mismatch, expected (?P<expected>\d+), got (?P<got>\d+)")
+        .unwrap();
     match re.captures(message) {
         None => None,
         Some(captures) => match (captures["expected"].parse(), captures["got"].parse()) {

diff --git a/crates/relayer/src/link/cli.rs b/crates/relayer/src/link/cli.rs
@@ -143,7 +143,10 @@ impl<ChainA: ChainHandle, ChainB: ChainHandle> Link<ChainA, ChainB> {
             self.a_to_b.src_chain(),
             &self.a_to_b.path_id,
         )
-        .map_err(LinkError::supervisor)? else { return Ok(vec![]) };
+        .map_err(LinkError::supervisor)?
+        else {
+            return Ok(vec![]);
+        };
 
         if sequences.is_empty() {
             return Ok(vec![]);

diff --git a/crates/relayer/src/link/relay_path.rs b/crates/relayer/src/link/relay_path.rs
@@ -1166,7 +1166,9 @@ impl<ChainA: ChainHandle, ChainB: ChainHandle> RelayPath<ChainA, ChainB> {
             unreceived_acknowledgements(self.dst_chain(), self.src_chain(), &self.path_id)
                 .map_err(LinkError::supervisor)?;
 
-        let Some((sequences, src_response_height)) = sequences_and_height else { return Ok(()) };
+        let Some((sequences, src_response_height)) = sequences_and_height else {
+            return Ok(());
+        };
 
         let query_height = opt_query_height.unwrap_or(src_response_height);