From f22f10b5cab3d70fe31256e0cb462aedeab0879e Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Tue, 24 Jun 2025 12:06:06 +0100 Subject: [PATCH 1/3] Simplify PartialOrd implementation Lint error with new nightly version "non-canonical implementation of `partial_cmp` on an `Ord` type". Update to directly call instead of dereferencing first. --- bitcoin/src/taproot/serialized_signature.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoin/src/taproot/serialized_signature.rs b/bitcoin/src/taproot/serialized_signature.rs index a63af0fe2..60a71584f 100644 --- a/bitcoin/src/taproot/serialized_signature.rs +++ b/bitcoin/src/taproot/serialized_signature.rs @@ -49,7 +49,7 @@ impl PartialEq for [u8] { impl PartialOrd for SerializedSignature { fn partial_cmp(&self, other: &SerializedSignature) -> Option { - Some((**self).cmp(&**other)) + Some(self.cmp(other)) } } From 0624d96415337e7c1a60d978bb0e5b783990fb62 Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Tue, 24 Jun 2025 12:08:12 +0100 Subject: [PATCH 2/3] Use the anonymous lifetime for path Lint error from new nightly "lifetime flowing from input to output with different syntax can be confusing". Add the anonymous lifetime to make it explicit. --- bitcoin/src/blockdata/transaction.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoin/src/blockdata/transaction.rs b/bitcoin/src/blockdata/transaction.rs index 7bcba7a23..654388b48 100644 --- a/bitcoin/src/blockdata/transaction.rs +++ b/bitcoin/src/blockdata/transaction.rs @@ -309,7 +309,7 @@ pub trait TransactionExt: sealed::Sealed { /// This is useful in combination with [`predict_weight`] if you have the transaction already /// constructed with a dummy value in the fee output which you'll adjust after calculating the /// weight. - fn script_pubkey_lens(&self) -> TxOutToScriptPubkeyLengthIter; + fn script_pubkey_lens(&self) -> TxOutToScriptPubkeyLengthIter<'_>; /// Counts the total number of sigops. /// From a5db001fc0be214fd7027997cfac991fa0c1e0c4 Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Tue, 24 Jun 2025 12:10:10 +0100 Subject: [PATCH 3/3] Update Github CI to rustc nightly-2025-06-20 Automated update failed CI due to new lint errors. Now lint errors have been fixed update the nightly version. --- nightly-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nightly-version b/nightly-version index e1c42351e..b54e2edfc 100644 --- a/nightly-version +++ b/nightly-version @@ -1 +1 @@ -nightly-2025-06-06 +nightly-2025-06-20