milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#4177: Manually update nightly version 

a4b9c196b1 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 a4b9c196b13a2029ef0de198114a29c71a192d03; successfully ran local tests

Tree-SHA512: a982ba05713c214af3b9375ecf37b66aea07ec0330392c30d2dbe3c9b40e1219b587ee43222f2355292b9b374a6a1d8a19d18b559bb47d33e544ed78509a51b8
This commit is contained in:
merge-script 2025-03-04 21:47:20 +00:00
parent 2a9b12b99e a4b9c196b1
commit 644adb4c18
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitcoin/src/psbt/mod.rs
View File

@ -135,6 +135,7 @@ impl Psbt {
/// An alias for [`extract_tx_fee_rate_limit`]. /// An alias for [`extract_tx_fee_rate_limit`].
/// ///
/// [`extract_tx_fee_rate_limit`]: Psbt::extract_tx_fee_rate_limit /// [`extract_tx_fee_rate_limit`]: Psbt::extract_tx_fee_rate_limit
#[allow(clippy::result_large_err)] // The PSBT returned in `SendingToomuch` is large.
pub fn extract_tx(self) -> Result<Transaction, ExtractTxError> { pub fn extract_tx(self) -> Result<Transaction, ExtractTxError> {
self.internal_extract_tx_with_fee_rate_limit(Self::DEFAULT_MAX_FEE_RATE) self.internal_extract_tx_with_fee_rate_limit(Self::DEFAULT_MAX_FEE_RATE)
} }
@ -146,6 +147,7 @@ impl Psbt {
/// [`ExtractTxError`] variants will contain either the [`Psbt`] itself or the [`Transaction`] /// [`ExtractTxError`] variants will contain either the [`Psbt`] itself or the [`Transaction`]
/// that was extracted. These can be extracted from the Errors in order to recover. /// that was extracted. These can be extracted from the Errors in order to recover.
/// See the error documentation for info on the variants. In general, it covers large fees. /// See the error documentation for info on the variants. In general, it covers large fees.
#[allow(clippy::result_large_err)] // The PSBT returned in `SendingToomuch` is large.
pub fn extract_tx_fee_rate_limit(self) -> Result<Transaction, ExtractTxError> { pub fn extract_tx_fee_rate_limit(self) -> Result<Transaction, ExtractTxError> {
self.internal_extract_tx_with_fee_rate_limit(Self::DEFAULT_MAX_FEE_RATE) self.internal_extract_tx_with_fee_rate_limit(Self::DEFAULT_MAX_FEE_RATE)
} }
@ -157,6 +159,7 @@ impl Psbt {
/// See [`extract_tx`]. /// See [`extract_tx`].
/// ///
/// [`extract_tx`]: Psbt::extract_tx /// [`extract_tx`]: Psbt::extract_tx
#[allow(clippy::result_large_err)] // The PSBT returned in `SendingToomuch` is large.
pub fn extract_tx_with_fee_rate_limit( pub fn extract_tx_with_fee_rate_limit(
self, self,
max_fee_rate: FeeRate, max_fee_rate: FeeRate,
@ -184,6 +187,7 @@ impl Psbt {
} }
#[inline] #[inline]
#[allow(clippy::result_large_err)] // The PSBT returned in `SendingToomuch` is large.
fn internal_extract_tx_with_fee_rate_limit( fn internal_extract_tx_with_fee_rate_limit(
self, self,
max_fee_rate: FeeRate, max_fee_rate: FeeRate,

2
nightly-version
View File

@ -1 +1 @@
nightly-2025-02-28 nightly-2025-03-03