Skip to content

Commit f047946

Browse files
committed
Merge rust-bitcoin#4732: Automated nightly rustfmt (2025-07-27)
fa92c10 2025-07-27 automated rustfmt nightly (Fmt Bot) Pull request description: Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action ACKs for top commit: tcharding: ACK fa92c10 Tree-SHA512: 07625da09456d6ef41f27e9f0112e36c16caa9223f53537a727f1ad9a2af198d39db00c814a4aee2e8be02f757f47c84f2645bbfcb56bc89ceb667829d49bbf2
2 parents 899e2db + fa92c10 commit f047946

6 files changed

Lines changed: 12 additions & 8 deletions

File tree

bitcoin/examples/sign-tx-segwit-v0.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
//! Demonstrate creating a transaction that spends to and from p2wpkh outputs.
44
5-
use bitcoin::key::WPubkeyHash;
65
use bitcoin::ext::*;
6+
use bitcoin::key::WPubkeyHash;
77
use bitcoin::locktime::absolute;
88
use bitcoin::secp256k1::{rand, Message, Secp256k1, SecretKey, Signing};
99
use bitcoin::sighash::{EcdsaSighashType, SighashCache};

bitcoin/examples/sign-tx-taproot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
//! Demonstrate creating a transaction that spends to and from p2tr outputs.
44
5-
use bitcoin::key::{Keypair, TapTweak, TweakedKeypair, UntweakedPublicKey};
65
use bitcoin::ext::*;
6+
use bitcoin::key::{Keypair, TapTweak, TweakedKeypair, UntweakedPublicKey};
77
use bitcoin::locktime::absolute;
88
use bitcoin::secp256k1::{rand, Message, Secp256k1, SecretKey, Signing, Verification};
99
use bitcoin::sighash::{Prevouts, SighashCache, TapSighashType};

bitcoin/src/blockdata/script/builder.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ impl Builder {
2424

2525
/// Constructs a new empty script builder with at least the specified capacity.
2626
#[inline]
27-
pub fn with_capacity(capacity: usize) -> Self {
28-
Self(ScriptBuf::with_capacity(capacity), None)
29-
}
27+
pub fn with_capacity(capacity: usize) -> Self { Self(ScriptBuf::with_capacity(capacity), None) }
3028

3129
/// Returns the length in bytes of the script.
3230
pub fn len(&self) -> usize { self.0.len() }

fuzz/fuzz_targets/bitcoin/deserialize_witness.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
use arbitrary::{Arbitrary, Unstructured};
12
use bitcoin::consensus::{deserialize, serialize};
23
use bitcoin::witness::Witness;
34
use honggfuzz::fuzz;
4-
use arbitrary::{Arbitrary, Unstructured};
55

66
fn do_test(data: &[u8]) {
77
let mut u = Unstructured::new(data);

units/src/locktime/absolute/error.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ mod tests {
266266
#[cfg(feature = "alloc")]
267267
fn locktime_unit_display() {
268268
use alloc::format;
269+
269270
use super::LockTimeUnit;
270271

271272
let blocks = LockTimeUnit::Blocks;

units/tests/api.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,15 +192,20 @@ fn api_can_use_all_types_from_module_locktime_absolute() {
192192
use bitcoin_units::locktime::absolute::error::{
193193
ConversionError as _, ParseHeightError as _, ParseTimeError as _,
194194
};
195-
use bitcoin_units::locktime::absolute::{Height, MedianTimePast, ConversionError, ParseHeightError, ParseTimeError};
195+
use bitcoin_units::locktime::absolute::{
196+
ConversionError, Height, MedianTimePast, ParseHeightError, ParseTimeError,
197+
};
196198
}
197199

198200
#[test]
199201
fn api_can_use_all_types_from_module_locktime_relative() {
200202
use bitcoin_units::locktime::relative::error::{
201203
InvalidHeightError as _, InvalidTimeError as _, TimeOverflowError as _,
202204
};
203-
use bitcoin_units::locktime::relative::{Height, NumberOf512Seconds, NumberOfBlocks, Time, InvalidHeightError, InvalidTimeError, TimeOverflowError};
205+
use bitcoin_units::locktime::relative::{
206+
Height, InvalidHeightError, InvalidTimeError, NumberOf512Seconds, NumberOfBlocks, Time,
207+
TimeOverflowError,
208+
};
204209
}
205210

206211
#[test]

0 commit comments

Comments
 (0)