Skip to content

Commit db9a1a4

Browse files
committed
Merge rust-bitcoin#2825: Automated nightly rustfmt (2024-06-02)
07ef78e 2024-06-02 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: apoelstra: ACK 07ef78e Tree-SHA512: 55aa43a0a1e3bc4d65246f949d91a56ab758488e7c2633f81735eab39c0f739d2b4ac180d69352e8a3296256fb5a5d1a16d434f7997e4d86143abdd68581076e
2 parents ee68e80 + 07ef78e commit db9a1a4

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

bitcoin/src/address/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,17 +245,17 @@ pub enum AddressData {
245245
/// Data encoded by a P2PKH address.
246246
P2pkh {
247247
/// The pubkey hash used to encumber outputs to this address.
248-
pubkey_hash: PubkeyHash
248+
pubkey_hash: PubkeyHash,
249249
},
250250
/// Data encoded by a P2SH address.
251251
P2sh {
252252
/// The script hash used to encumber outputs to this address.
253-
script_hash: ScriptHash
253+
script_hash: ScriptHash,
254254
},
255255
/// Data encoded by a Segwit address.
256256
Segwit {
257257
/// The witness program used to encumber outputs to this address.
258-
witness_program: WitnessProgram
258+
witness_program: WitnessProgram,
259259
},
260260
}
261261

hashes/src/hkdf.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55
//! Implementation based on RFC5869, but the interface is scoped
66
//! to BIP324's requirements.
77
8-
use core::fmt;
9-
108
#[cfg(all(feature = "alloc", not(feature = "std")))]
119
use alloc::vec;
1210
#[cfg(all(feature = "alloc", not(feature = "std")))]
1311
use alloc::vec::Vec;
12+
use core::fmt;
1413

1514
use crate::{Hash, HashEngine, Hmac, HmacEngine};
1615

0 commit comments

Comments
 (0)