From a1104767aa2cf26f417d372ae5a9ae273b9b99b8 Mon Sep 17 00:00:00 2001
From: Andrew Poelstra <apoelstra@wpsoftware.net>
Date: Tue, 2 Jan 2024 17:40:17 +0000
Subject: [PATCH] bump MSRV to 1.56.1

---
 .github/workflows/rust.yml |  4 ++--
 clippy.toml                |  2 +-
 contrib/test.sh            | 13 +++----------
 src/taproot.rs             |  2 +-
 src/transaction.rs         |  9 ++++-----
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4081dbfc..2ffccfe2 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -49,7 +49,7 @@ jobs:
         run: ./contrib/test.sh
 
   MSRV:
-    name: Test - 1.48.0 toolchain
+    name: Test - 1.56.1 toolchain
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -57,7 +57,7 @@ jobs:
       - name: Checkout Crate
         uses: actions/checkout@v3
       - name: Checkout Toolchain
-        uses: dtolnay/rust-toolchain@1.48.0
+        uses: dtolnay/rust-toolchain@1.56.1
       - name: Running test script
         env:
           DO_DOCS: false
diff --git a/clippy.toml b/clippy.toml
index 11d46a73..56ce04e4 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1 +1 @@
-msrv = "1.48.0"
+msrv = "1.56.1"
diff --git a/contrib/test.sh b/contrib/test.sh
index 6b87b046..c1098029 100755
--- a/contrib/test.sh
+++ b/contrib/test.sh
@@ -3,17 +3,10 @@
 FEATURES="serde"
 
 # Pin dependencies as required if we are using MSRV toolchain.
-if cargo --version | grep "1\.48"; then
-    cargo update -p serde_json --precise 1.0.99
-    # 1.0.157 uses syn 2.0 which requires edition 2018
-    cargo update -p serde --precise 1.0.156
-    cargo update -p once_cell --precise 1.13.1
-    cargo update -p quote --precise 1.0.28
-    cargo update -p proc-macro2 --precise 1.0.63
-    cargo update -p serde_test --precise 1.0.156
-
-    cargo update -p log --precise 0.4.18
+if cargo --version | grep "1\.56"; then
     cargo update -p tempfile --precise 3.6.0
+    cargo update -p once_cell --precise 1.13.1
+    cargo update -p which --precise 4.4.0
     cargo update -p byteorder --precise 1.4.3
 fi
 
diff --git a/src/taproot.rs b/src/taproot.rs
index 90cac0e5..011f36ca 100644
--- a/src/taproot.rs
+++ b/src/taproot.rs
@@ -988,7 +988,7 @@ mod tests{
         let tree_info = builder.finalize(&secp, internal_key).unwrap();
         let output_key = tree_info.output_key();
 
-        for script in vec![a, b, c, d, e] {
+        for script in [a, b, c, d, e] {
             let ver_script = (script, LeafVersion::default());
             let ctrl_block = tree_info.control_block(&ver_script).unwrap();
             assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0))
diff --git a/src/transaction.rs b/src/transaction.rs
index 6196aa9d..6f825709 100644
--- a/src/transaction.rs
+++ b/src/transaction.rs
@@ -2374,10 +2374,9 @@ mod tests {
     #[test]
     fn superfluous_asset_issuance() {
         let tx = Vec::<u8>::from_hex("1ae80068000109fee1000000000000000000000000000000000000000000000000000000000000005acf37f60000c7280028a7000000006e000000010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010115190000b9bfb80000000100000000d8d8d8d8d8d8d8d8d8d8d8d8d8d80000000000b8bfb8").unwrap();
-        if let encode::Error::ParseFailed("superfluous asset issuance") = Transaction::consensus_decode(&tx[..]).unwrap_err() {
-            // ok. FIXME replace this with matches! when we move to 1.48.0
-        } else {
-            panic!("Incorrect error for bad transaction");
-        }
+        assert!(matches!(
+            Transaction::consensus_decode(&tx[..]),
+            Err(encode::Error::ParseFailed("superfluous asset issuance")),
+        ));
     }
 }