diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c9c230cd2..8a45324bf 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -322,6 +322,6 @@ jobs: toolchain: ${{ needs.Prepare.outputs.nightly_version }} - name: "Install cargo-public-api" # Pin version so that updates don't introduce changes to the text files. - run: cargo +stable install --locked cargo-public-api@0.42.0 + run: cargo +stable install --locked cargo-public-api@0.43.0 - name: "Run API checker script" run: ./contrib/check-for-api-changes.sh diff --git a/bitcoin/src/blockdata/script/instruction.rs b/bitcoin/src/blockdata/script/instruction.rs index 8bf30cdd7..410f6d521 100644 --- a/bitcoin/src/blockdata/script/instruction.rs +++ b/bitcoin/src/blockdata/script/instruction.rs @@ -47,12 +47,7 @@ impl Instruction<'_> { _ => None, } } - Instruction::PushBytes(bytes) => { - match super::read_scriptint_non_minimal(bytes.as_bytes()) { - Ok(v) => Some(v), - _ => None, - } - } + Instruction::PushBytes(bytes) => super::read_scriptint_non_minimal(bytes.as_bytes()).ok(), } } @@ -78,10 +73,7 @@ impl Instruction<'_> { _ => None, } } - Instruction::PushBytes(bytes) => match bytes.read_scriptint() { - Ok(v) => Some(v), - _ => None, - }, + Instruction::PushBytes(bytes) => bytes.read_scriptint().ok(), } } } diff --git a/hashes/src/internal_macros.rs b/hashes/src/internal_macros.rs index 39999b3dd..959ccdb47 100644 --- a/hashes/src/internal_macros.rs +++ b/hashes/src/internal_macros.rs @@ -9,7 +9,7 @@ /// /// * `$bits` - number of bits this hash type has /// * `$reverse` - `bool` - `true` if the hash type should be displayed backwards, `false` -/// otherwise. +/// otherwise. /// * `$gen: $gent` - generic type(s) and trait bound(s) /// /// Restrictions on usage: diff --git a/nightly-version b/nightly-version index b085f16de..609e36af3 100644 --- a/nightly-version +++ b/nightly-version @@ -1 +1 @@ -nightly-2025-01-24 +nightly-2025-01-31