Skip to content

Commit a110476

Browse files
committed
bump MSRV to 1.56.1
1 parent 613204f commit a110476

File tree

5 files changed

+11
-19
lines changed

5 files changed

+11
-19
lines changed

.github/workflows/rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ jobs:
4949
run: ./contrib/test.sh
5050

5151
MSRV:
52-
name: Test - 1.48.0 toolchain
52+
name: Test - 1.56.1 toolchain
5353
runs-on: ubuntu-latest
5454
strategy:
5555
fail-fast: false
5656
steps:
5757
- name: Checkout Crate
5858
uses: actions/checkout@v3
5959
- name: Checkout Toolchain
60-
uses: dtolnay/rust-toolchain@1.48.0
60+
uses: dtolnay/rust-toolchain@1.56.1
6161
- name: Running test script
6262
env:
6363
DO_DOCS: false

clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msrv = "1.48.0"
1+
msrv = "1.56.1"

contrib/test.sh

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,10 @@
33
FEATURES="serde"
44

55
# Pin dependencies as required if we are using MSRV toolchain.
6-
if cargo --version | grep "1\.48"; then
7-
cargo update -p serde_json --precise 1.0.99
8-
# 1.0.157 uses syn 2.0 which requires edition 2018
9-
cargo update -p serde --precise 1.0.156
10-
cargo update -p once_cell --precise 1.13.1
11-
cargo update -p quote --precise 1.0.28
12-
cargo update -p proc-macro2 --precise 1.0.63
13-
cargo update -p serde_test --precise 1.0.156
14-
15-
cargo update -p log --precise 0.4.18
6+
if cargo --version | grep "1\.56"; then
167
cargo update -p tempfile --precise 3.6.0
8+
cargo update -p once_cell --precise 1.13.1
9+
cargo update -p which --precise 4.4.0
1710
cargo update -p byteorder --precise 1.4.3
1811
fi
1912

src/taproot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ mod tests{
988988
let tree_info = builder.finalize(&secp, internal_key).unwrap();
989989
let output_key = tree_info.output_key();
990990

991-
for script in vec![a, b, c, d, e] {
991+
for script in [a, b, c, d, e] {
992992
let ver_script = (script, LeafVersion::default());
993993
let ctrl_block = tree_info.control_block(&ver_script).unwrap();
994994
assert!(ctrl_block.verify_taproot_commitment(&secp, &output_key, &ver_script.0))

src/transaction.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2374,10 +2374,9 @@ mod tests {
23742374
#[test]
23752375
fn superfluous_asset_issuance() {
23762376
let tx = Vec::<u8>::from_hex("1ae80068000109fee1000000000000000000000000000000000000000000000000000000000000005acf37f60000c7280028a7000000006e000000010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010115190000b9bfb80000000100000000d8d8d8d8d8d8d8d8d8d8d8d8d8d80000000000b8bfb8").unwrap();
2377-
if let encode::Error::ParseFailed("superfluous asset issuance") = Transaction::consensus_decode(&tx[..]).unwrap_err() {
2378-
// ok. FIXME replace this with matches! when we move to 1.48.0
2379-
} else {
2380-
panic!("Incorrect error for bad transaction");
2381-
}
2377+
assert!(matches!(
2378+
Transaction::consensus_decode(&tx[..]),
2379+
Err(encode::Error::ParseFailed("superfluous asset issuance")),
2380+
));
23822381
}
23832382
}

0 commit comments

Comments
 (0)