Merge rust-bitcoin/rust-bitcoin#2825: Automated nightly rustfmt (2024-06-02)

07ef78ea96 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 07ef78ea96

Tree-SHA512: 55aa43a0a1e3bc4d65246f949d91a56ab758488e7c2633f81735eab39c0f739d2b4ac180d69352e8a3296256fb5a5d1a16d434f7997e4d86143abdd68581076e

bitcoin/src/address/mod.rs

@@ -245,17 +245,17 @@ pub enum AddressData {
     /// Data encoded by a P2PKH address.
     P2pkh {
         /// The pubkey hash used to encumber outputs to this address.
-        pubkey_hash: PubkeyHash
+        pubkey_hash: PubkeyHash,
     },
     /// Data encoded by a P2SH address.
     P2sh {
         /// The script hash used to encumber outputs to this address.
-        script_hash: ScriptHash
+        script_hash: ScriptHash,
     },
     /// Data encoded by a Segwit address.
     Segwit {
         /// The witness program used to encumber outputs to this address.
-        witness_program: WitnessProgram
+        witness_program: WitnessProgram,
     },
 }
 

hashes/src/hkdf.rs

@@ -5,12 +5,11 @@
 //! Implementation based on RFC5869, but the interface is scoped
 //! to BIP324's requirements.
 
-use core::fmt;
-
 #[cfg(all(feature = "alloc", not(feature = "std")))]
 use alloc::vec;
 #[cfg(all(feature = "alloc", not(feature = "std")))]
 use alloc::vec::Vec;
+use core::fmt;
 
 use crate::{Hash, HashEngine, Hmac, HmacEngine};