Merge rust-bitcoin/rust-bitcoin#4005: Manual update to rustc (to nightly-2025-01-31)

ebab2d9aa7 Update cargo-public-api version (Jamil Lambert, PhD)
3b350d4f54 Update to rustc (to nightly-2025-01-31) (Jamil Lambert, PhD)
55ab2f34a7 Remove manual implementation of ok (Jamil Lambert, PhD)
30132c56bb Fix rustdoc indentation (Jamil Lambert, PhD)

Pull request description:

  Fix the errors found when updating `rustc` to `nightly-2025-01-31`.  Then update the version in `nightly-version`.

  Update `cargo-public-api` to `v0.43.0` since `v0.42.0` is only compatible with `nightly-2024-10-18 — nightly-2025-01-24`

ACKs for top commit:
  apoelstra:
    ACK ebab2d9aa7310eb62a6c42bf4dfb266cff441965; successfully ran local tests
  tcharding:
    ACK ebab2d9aa7

Tree-SHA512: 3c037b8bbfb0fa69be1b6fa1438c7c38636683dc7ffe9bce018afdd6b9033edaa18b5f3e5fa489ebb720221b8780ff628e573b5408270bf6c45edf9ca01a97e7

.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

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(),
         }
     }
 }

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:

nightly-version

@@ -1 +1 @@
-nightly-2025-01-24
+nightly-2025-01-31