Skip to content

Commit 644adb4

Browse files
committed
Merge rust-bitcoin#4177: Manually update nightly version
a4b9c19 Manually update nightly version (Tobin C. Harding) Pull request description: While trying to use the `macro_use_imports` lint I found that there is a bug in last weeks nightly. It has been fixed already so lets update. Update to todays nightly compiler. Doing so causes some new linter warnings, for now we just allow them. ACKs for top commit: apoelstra: ACK a4b9c19; successfully ran local tests Tree-SHA512: a982ba05713c214af3b9375ecf37b66aea07ec0330392c30d2dbe3c9b40e1219b587ee43222f2355292b9b374a6a1d8a19d18b559bb47d33e544ed78509a51b8
2 parents 2a9b12b + a4b9c19 commit 644adb4

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

bitcoin/src/psbt/mod.rs

+4
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ impl Psbt {
135135
/// An alias for [`extract_tx_fee_rate_limit`].
136136
///
137137
/// [`extract_tx_fee_rate_limit`]: Psbt::extract_tx_fee_rate_limit
138+
#[allow(clippy::result_large_err)] // The PSBT returned in `SendingToomuch` is large.
138139
pub fn extract_tx(self) -> Result<Transaction, ExtractTxError> {
139140
self.internal_extract_tx_with_fee_rate_limit(Self::DEFAULT_MAX_FEE_RATE)
140141
}
@@ -146,6 +147,7 @@ impl Psbt {
146147
/// [`ExtractTxError`] variants will contain either the [`Psbt`] itself or the [`Transaction`]
147148
/// that was extracted. These can be extracted from the Errors in order to recover.
148149
/// See the error documentation for info on the variants. In general, it covers large fees.
150+
#[allow(clippy::result_large_err)] // The PSBT returned in `SendingToomuch` is large.
149151
pub fn extract_tx_fee_rate_limit(self) -> Result<Transaction, ExtractTxError> {
150152
self.internal_extract_tx_with_fee_rate_limit(Self::DEFAULT_MAX_FEE_RATE)
151153
}
@@ -157,6 +159,7 @@ impl Psbt {
157159
/// See [`extract_tx`].
158160
///
159161
/// [`extract_tx`]: Psbt::extract_tx
162+
#[allow(clippy::result_large_err)] // The PSBT returned in `SendingToomuch` is large.
160163
pub fn extract_tx_with_fee_rate_limit(
161164
self,
162165
max_fee_rate: FeeRate,
@@ -184,6 +187,7 @@ impl Psbt {
184187
}
185188

186189
#[inline]
190+
#[allow(clippy::result_large_err)] // The PSBT returned in `SendingToomuch` is large.
187191
fn internal_extract_tx_with_fee_rate_limit(
188192
self,
189193
max_fee_rate: FeeRate,

nightly-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2025-02-28
1+
nightly-2025-03-03

0 commit comments

Comments
 (0)