From 8b4280d5ef489df6107fa914e72ed405eb1773c6 Mon Sep 17 00:00:00 2001
From: Martin Habovstiak <martin.habovstiak@gmail.com>
Date: Sun, 2 Apr 2023 16:25:09 +0200
Subject: [PATCH] Update clippy MSRV configuration

We've upgraded MSRV but didn't update clippy config, so some things that
could be improved aren't caught by clippy. This updates the config and
fixes the new issues.

I also `rg '1\.41\.1'`ed for interesting changes and found one
additional improvement.
---
 bitcoin/src/address.rs                     | 8 ++++----
 bitcoin/src/blockdata/locktime/relative.rs | 4 +---
 bitcoin/src/network/address.rs             | 5 +----
 bitcoin/tests/serde.rs                     | 4 +---
 clippy.toml                                | 2 +-
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/bitcoin/src/address.rs b/bitcoin/src/address.rs
index 7ca8897c..19000db4 100644
--- a/bitcoin/src/address.rs
+++ b/bitcoin/src/address.rs
@@ -1020,10 +1020,10 @@ impl Address<NetworkUnchecked> {
     /// assert_eq!(address.is_valid_for_network(Network::Testnet), false);
     /// ```
     pub fn is_valid_for_network(&self, network: Network) -> bool {
-        let is_legacy = match self.address_type_internal() {
-            Some(AddressType::P2pkh) | Some(AddressType::P2sh) => true,
-            _ => false,
-        };
+        let is_legacy = matches!(
+            self.address_type_internal(),
+            Some(AddressType::P2pkh) | Some(AddressType::P2sh)
+        );
 
         match (self.network, network) {
             (a, b) if a == b => true,
diff --git a/bitcoin/src/blockdata/locktime/relative.rs b/bitcoin/src/blockdata/locktime/relative.rs
index 08d95672..21fb237e 100644
--- a/bitcoin/src/blockdata/locktime/relative.rs
+++ b/bitcoin/src/blockdata/locktime/relative.rs
@@ -62,10 +62,8 @@ impl LockTime {
     pub fn is_satisfied_by(&self, h: Height, t: Time) -> bool {
         if let Ok(true) = self.is_satisfied_by_height(h) {
             true
-        } else if let Ok(true) = self.is_satisfied_by_time(t) {
-            true
         } else {
-            false
+            matches!(self.is_satisfied_by_time(t), Ok(true))
         }
     }
 
diff --git a/bitcoin/src/network/address.rs b/bitcoin/src/network/address.rs
index 7ca764e3..d9544b5c 100644
--- a/bitcoin/src/network/address.rs
+++ b/bitcoin/src/network/address.rs
@@ -359,10 +359,7 @@ mod test {
         ]);
         assert!(addr.is_ok());
         let full = addr.unwrap();
-        assert!(match full.socket_addr().unwrap() {
-            SocketAddr::V4(_) => true,
-            _ => false,
-        });
+        assert!(matches!(full.socket_addr().unwrap(), SocketAddr::V4(_)));
         assert_eq!(full.services, ServiceFlags::NETWORK);
         assert_eq!(full.address, [0, 0, 0, 0, 0, 0xffff, 0x0a00, 0x0001]);
         assert_eq!(full.port, 8333);
diff --git a/bitcoin/tests/serde.rs b/bitcoin/tests/serde.rs
index 7da5478c..042ac0ba 100644
--- a/bitcoin/tests/serde.rs
+++ b/bitcoin/tests/serde.rs
@@ -50,9 +50,7 @@ fn serde_regression_block() {
     );
     let block: Block = deserialize(segwit).unwrap();
     let got = serialize(&block).unwrap();
-    // The cast is required because Rust 1.41.1 throws the following error without it:
-    // the trait `std::array::LengthAtMost32` is not implemented for `[u8; 5123]`
-    let want = include_bytes!("data/serde/block_bincode") as &[_];
+    let want = include_bytes!("data/serde/block_bincode");
     assert_eq!(got, want)
 }
 
diff --git a/clippy.toml b/clippy.toml
index 799264ef..11d46a73 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1 +1 @@
-msrv = "1.41.1"
+msrv = "1.48.0"