Skip to content

Commit 8dc4b83

Browse files
committed
Merge rust-bitcoin#4638: Manual daily update to rustc (to nightly-2025-06-20)
a5db001 Update Github CI to rustc nightly-2025-06-20 (Jamil Lambert, PhD) 0624d96 Use the anonymous lifetime for path (Jamil Lambert, PhD) f22f10b Simplify PartialOrd implementation (Jamil Lambert, PhD) Pull request description: Automated daily update to rustc (to nightly-2025-06-20) failed CI due to new lint errors (rust-bitcoin#4598). Fix the lint errors. Update to nightly-2025-06-20. ACKs for top commit: apoelstra: ACK a5db001; successfully ran local tests Tree-SHA512: a396b7b696c2a6a904a832e3ffd14bc2a6f27936aa076641d3f03c6000be4962606b9398c1f82d9aa12ddf919023d87302b338a9779084ef521411f6f0151220
2 parents d84745f + a5db001 commit 8dc4b83

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

bitcoin/src/blockdata/transaction.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ pub trait TransactionExt: sealed::Sealed {
309309
/// This is useful in combination with [`predict_weight`] if you have the transaction already
310310
/// constructed with a dummy value in the fee output which you'll adjust after calculating the
311311
/// weight.
312-
fn script_pubkey_lens(&self) -> TxOutToScriptPubkeyLengthIter;
312+
fn script_pubkey_lens(&self) -> TxOutToScriptPubkeyLengthIter<'_>;
313313

314314
/// Counts the total number of sigops.
315315
///

bitcoin/src/taproot/serialized_signature.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ impl PartialEq<SerializedSignature> for [u8] {
4949

5050
impl PartialOrd for SerializedSignature {
5151
fn partial_cmp(&self, other: &SerializedSignature) -> Option<core::cmp::Ordering> {
52-
Some((**self).cmp(&**other))
52+
Some(self.cmp(other))
5353
}
5454
}
5555

nightly-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2025-06-06
1+
nightly-2025-06-20

0 commit comments

Comments
 (0)