Merge rust-bitcoin/rust-bitcoin#4638: Manual daily update to rustc (to nightly-2025-06-20)
a5db001fc0
Update Github CI to rustc nightly-2025-06-20 (Jamil Lambert, PhD)0624d96415
Use the anonymous lifetime for path (Jamil Lambert, PhD)f22f10b5ca
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 (#4598). Fix the lint errors. Update to nightly-2025-06-20. ACKs for top commit: apoelstra: ACK a5db001fc0be214fd7027997cfac991fa0c1e0c4; successfully ran local tests Tree-SHA512: a396b7b696c2a6a904a832e3ffd14bc2a6f27936aa076641d3f03c6000be4962606b9398c1f82d9aa12ddf919023d87302b338a9779084ef521411f6f0151220
This commit is contained in:
commit
8dc4b832c5
|
@ -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.
|
||||
///
|
||||
|
|
|
@ -49,7 +49,7 @@ impl PartialEq<SerializedSignature> for [u8] {
|
|||
|
||||
impl PartialOrd for SerializedSignature {
|
||||
fn partial_cmp(&self, other: &SerializedSignature) -> Option<core::cmp::Ordering> {
|
||||
Some((**self).cmp(&**other))
|
||||
Some(self.cmp(other))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
nightly-2025-06-06
|
||||
nightly-2025-06-20
|
||||
|
|
Loading…
Reference in New Issue