Run the formatter

Run `cargo +nightly fmt`, no other manual changes.

Author: tcharding

bitcoind-tests/tests/test_cpp.rs

@@ -48,9 +48,7 @@ where
 }
 
 /// Quickly create a BTC amount.
-fn btc<F: Into<f64>>(btc: F) -> Amount {
-    Amount::from_btc(btc.into()).unwrap()
-}
+fn btc<F: Into<f64>>(btc: F) -> Amount { Amount::from_btc(btc.into()).unwrap() }
 
 // Find the Outpoint by value.
 // Ideally, we should find by scriptPubkey, but this
@@ -249,9 +247,7 @@ pub fn test_from_cpp_ms(cl: &Client, testdata: &TestData) {
 }
 
 #[test]
-fn test_setup() {
-    setup::setup();
-}
+fn test_setup() { setup::setup(); }
 
 #[test]
 fn tests_from_cpp() {

bitcoind-tests/tests/test_desc.rs

@@ -25,9 +25,7 @@ mod setup;
 use rand::RngCore;
 use setup::test_util::{self, TestData};
 /// Quickly create a BTC amount.
-fn btc<F: Into<f64>>(btc: F) -> Amount {
-    Amount::from_btc(btc.into()).unwrap()
-}
+fn btc<F: Into<f64>>(btc: F) -> Amount { Amount::from_btc(btc.into()).unwrap() }
 
 // Find the Outpoint by spk
 fn get_vout(cl: &Client, txid: Txid, value: u64, spk: ScriptBuf) -> (OutPoint, TxOut) {

src/descriptor/bare.rs

@@ -41,14 +41,10 @@ impl<Pk: MiniscriptKey> Bare<Pk> {
     }
 
     /// get the inner
-    pub fn into_inner(self) -> Miniscript<Pk, BareCtx> {
-        self.ms
-    }
+    pub fn into_inner(self) -> Miniscript<Pk, BareCtx> { self.ms }
 
     /// get the inner
-    pub fn as_inner(&self) -> &Miniscript<Pk, BareCtx> {
-        &self.ms
-    }
+    pub fn as_inner(&self) -> &Miniscript<Pk, BareCtx> { &self.ms }
 
     /// Checks whether the descriptor is safe.
     pub fn sanity_check(&self) -> Result<(), Error> {
@@ -94,19 +90,13 @@ impl<Pk: MiniscriptKey> Bare<Pk> {
 
 impl<Pk: MiniscriptKey + ToPublicKey> Bare<Pk> {
     /// Obtains the corresponding script pubkey for this descriptor.
-    pub fn script_pubkey(&self) -> ScriptBuf {
-        self.ms.encode()
-    }
+    pub fn script_pubkey(&self) -> ScriptBuf { self.ms.encode() }
 
     /// Obtains the underlying miniscript for this descriptor.
-    pub fn inner_script(&self) -> ScriptBuf {
-        self.script_pubkey()
-    }
+    pub fn inner_script(&self) -> ScriptBuf { self.script_pubkey() }
 
     /// Obtains the pre bip-340 signature script code for this descriptor.
-    pub fn ecdsa_sighash_script_code(&self) -> ScriptBuf {
-        self.script_pubkey()
-    }
+    pub fn ecdsa_sighash_script_code(&self) -> ScriptBuf { self.script_pubkey() }
 
     /// Returns satisfying non-malleable witness and scriptSig with minimum
     /// weight to spend an output controlled by the given descriptor if it is
@@ -136,9 +126,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Bare<Pk> {
 }
 
 impl<Pk: MiniscriptKey> fmt::Debug for Bare<Pk> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:?}", self.ms)
-    }
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "{:?}", self.ms) }
 }
 
 impl<Pk: MiniscriptKey> fmt::Display for Bare<Pk> {
@@ -151,9 +139,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Bare<Pk> {
 }
 
 impl<Pk: MiniscriptKey> Liftable<Pk> for Bare<Pk> {
-    fn lift(&self) -> Result<semantic::Policy<Pk>, Error> {
-        self.ms.lift()
-    }
+    fn lift(&self) -> Result<semantic::Policy<Pk>, Error> { self.ms.lift() }
 }
 
 impl_from_tree!(
@@ -214,14 +200,10 @@ impl<Pk: MiniscriptKey> Pkh<Pk> {
     }
 
     /// Get a reference to the inner key
-    pub fn as_inner(&self) -> &Pk {
-        &self.pk
-    }
+    pub fn as_inner(&self) -> &Pk { &self.pk }
 
     /// Get the inner key
-    pub fn into_inner(self) -> Pk {
-        self.pk
-    }
+    pub fn into_inner(self) -> Pk { self.pk }
 
     /// Computes an upper bound on the difference between a non-satisfied
     /// `TxIn`'s `segwit_weight` and a satisfied `TxIn`'s `segwit_weight`
@@ -250,9 +232,7 @@ impl<Pk: MiniscriptKey> Pkh<Pk> {
     /// Assumes all ec-signatures are 73 bytes, including push opcode and
     /// sighash suffix. Includes the weight of the VarInts encoding the
     /// scriptSig and witness stack length.
-    pub fn max_satisfaction_weight(&self) -> usize {
-        4 * (1 + 73 + BareCtx::pk_len(&self.pk))
-    }
+    pub fn max_satisfaction_weight(&self) -> usize { 4 * (1 + 73 + BareCtx::pk_len(&self.pk)) }
 }
 
 impl<Pk: MiniscriptKey + ToPublicKey> Pkh<Pk> {
@@ -270,14 +250,10 @@ impl<Pk: MiniscriptKey + ToPublicKey> Pkh<Pk> {
     }
 
     /// Obtains the underlying miniscript for this descriptor.
-    pub fn inner_script(&self) -> ScriptBuf {
-        self.script_pubkey()
-    }
+    pub fn inner_script(&self) -> ScriptBuf { self.script_pubkey() }
 
     /// Obtains the pre bip-340 signature script code for this descriptor.
-    pub fn ecdsa_sighash_script_code(&self) -> ScriptBuf {
-        self.script_pubkey()
-    }
+    pub fn ecdsa_sighash_script_code(&self) -> ScriptBuf { self.script_pubkey() }
 
     /// Returns satisfying non-malleable witness and scriptSig with minimum
     /// weight to spend an output controlled by the given descriptor if it is
@@ -313,9 +289,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Pkh<Pk> {
 }
 
 impl<Pk: MiniscriptKey> fmt::Debug for Pkh<Pk> {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "pkh({:?})", self.pk)
-    }
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "pkh({:?})", self.pk) }
 }
 
 impl<Pk: MiniscriptKey> fmt::Display for Pkh<Pk> {
@@ -361,9 +335,7 @@ impl_from_str!(
 );
 
 impl<Pk: MiniscriptKey> ForEachKey<Pk> for Pkh<Pk> {
-    fn for_each_key<'a, F: FnMut(&'a Pk) -> bool>(&'a self, mut pred: F) -> bool {
-        pred(&self.pk)
-    }
+    fn for_each_key<'a, F: FnMut(&'a Pk) -> bool>(&'a self, mut pred: F) -> bool { pred(&self.pk) }
 }
 
 impl<P, Q> TranslatePk<P, Q> for Pkh<P>

src/descriptor/checksum.rs

@@ -80,9 +80,7 @@ pub struct Engine {
 }
 
 impl Default for Engine {
-    fn default() -> Engine {
-        Engine::new()
-    }
+    fn default() -> Engine { Engine::new() }
 }
 
 impl Engine {

src/descriptor/key.rs

@@ -86,14 +86,10 @@ impl DerivPaths {
     }
 
     /// Get the list of derivation paths.
-    pub fn paths(&self) -> &Vec<bip32::DerivationPath> {
-        &self.0
-    }
+    pub fn paths(&self) -> &Vec<bip32::DerivationPath> { &self.0 }
 
     /// Get the list of derivation paths.
-    pub fn into_paths(self) -> Vec<bip32::DerivationPath> {
-        self.0
-    }
+    pub fn into_paths(self) -> Vec<bip32::DerivationPath> { self.0 }
 }
 
 /// Instance of one or more extended keys, as specified in BIP 389.
@@ -173,19 +169,15 @@ impl InnerXKey for bip32::ExtendedPubKey {
         self.fingerprint()
     }
 
-    fn can_derive_hardened() -> bool {
-        false
-    }
+    fn can_derive_hardened() -> bool { false }
 }
 
 impl InnerXKey for bip32::ExtendedPrivKey {
     fn xkey_fingerprint<C: Signing>(&self, secp: &Secp256k1<C>) -> bip32::Fingerprint {
         self.fingerprint(secp)
     }
 
-    fn can_derive_hardened() -> bool {
-        true
-    }
+    fn can_derive_hardened() -> bool { true }
 }
 
 /// Whether a descriptor has a wildcard in it
@@ -271,16 +263,12 @@ impl DescriptorXKey<bip32::ExtendedPrivKey> {
 pub struct DescriptorKeyParseError(&'static str);
 
 impl fmt::Display for DescriptorKeyParseError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str(self.0)
-    }
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { f.write_str(self.0) }
 }
 
 #[cfg(feature = "std")]
 impl error::Error for DescriptorKeyParseError {
-    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
-        None
-    }
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> { None }
 }
 
 impl fmt::Display for DescriptorPublicKey {
@@ -594,9 +582,7 @@ impl DescriptorPublicKey {
 
     /// Whether or not the key has a wildcard
     #[deprecated(note = "use has_wildcard instead")]
-    pub fn is_deriveable(&self) -> bool {
-        self.has_wildcard()
-    }
+    pub fn is_deriveable(&self) -> bool { self.has_wildcard() }
 
     /// Whether or not the key has a wildcard
     pub fn has_wildcard(&self) -> bool {
@@ -1066,24 +1052,18 @@ impl DefiniteDescriptorKey {
     }
 
     /// The fingerprint of the master key associated with this key, `0x00000000` if none.
-    pub fn master_fingerprint(&self) -> bip32::Fingerprint {
-        self.0.master_fingerprint()
-    }
+    pub fn master_fingerprint(&self) -> bip32::Fingerprint { self.0.master_fingerprint() }
 
     /// Full path from the master key if not a multipath extended key.
     pub fn full_derivation_path(&self) -> Option<bip32::DerivationPath> {
         self.0.full_derivation_path()
     }
 
     /// Reference to the underlying `DescriptorPublicKey`
-    pub fn as_descriptor_public_key(&self) -> &DescriptorPublicKey {
-        &self.0
-    }
+    pub fn as_descriptor_public_key(&self) -> &DescriptorPublicKey { &self.0 }
 
     /// Converts the definite key into a generic one
-    pub fn into_descriptor_public_key(self) -> DescriptorPublicKey {
-        self.0
-    }
+    pub fn into_descriptor_public_key(self) -> DescriptorPublicKey { self.0 }
 }
 
 impl FromStr for DefiniteDescriptorKey {
@@ -1098,9 +1078,7 @@ impl FromStr for DefiniteDescriptorKey {
 }
 
 impl fmt::Display for DefiniteDescriptorKey {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        self.0.fmt(f)
-    }
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { self.0.fmt(f) }
 }
 
 impl MiniscriptKey for DefiniteDescriptorKey {
@@ -1109,17 +1087,11 @@ impl MiniscriptKey for DefiniteDescriptorKey {
     type Ripemd160 = ripemd160::Hash;
     type Hash160 = hash160::Hash;
 
-    fn is_uncompressed(&self) -> bool {
-        self.0.is_uncompressed()
-    }
+    fn is_uncompressed(&self) -> bool { self.0.is_uncompressed() }
 
-    fn is_x_only_key(&self) -> bool {
-        self.0.is_x_only_key()
-    }
+    fn is_x_only_key(&self) -> bool { self.0.is_x_only_key() }
 
-    fn num_der_paths(&self) -> usize {
-        self.0.num_der_paths()
-    }
+    fn num_der_paths(&self) -> usize { self.0.num_der_paths() }
 }
 
 impl ToPublicKey for DefiniteDescriptorKey {
@@ -1128,33 +1100,21 @@ impl ToPublicKey for DefiniteDescriptorKey {
         self.derive_public_key(&secp).unwrap()
     }
 
-    fn to_sha256(hash: &sha256::Hash) -> sha256::Hash {
-        *hash
-    }
+    fn to_sha256(hash: &sha256::Hash) -> sha256::Hash { *hash }
 
-    fn to_hash256(hash: &hash256::Hash) -> hash256::Hash {
-        *hash
-    }
+    fn to_hash256(hash: &hash256::Hash) -> hash256::Hash { *hash }
 
-    fn to_ripemd160(hash: &ripemd160::Hash) -> ripemd160::Hash {
-        *hash
-    }
+    fn to_ripemd160(hash: &ripemd160::Hash) -> ripemd160::Hash { *hash }
 
-    fn to_hash160(hash: &hash160::Hash) -> hash160::Hash {
-        *hash
-    }
+    fn to_hash160(hash: &hash160::Hash) -> hash160::Hash { *hash }
 }
 
 impl From<DefiniteDescriptorKey> for DescriptorPublicKey {
-    fn from(d: DefiniteDescriptorKey) -> Self {
-        d.0
-    }
+    fn from(d: DefiniteDescriptorKey) -> Self { d.0 }
 }
 
 impl Borrow<DescriptorPublicKey> for DefiniteDescriptorKey {
-    fn borrow(&self) -> &DescriptorPublicKey {
-        &self.0
-    }
+    fn borrow(&self) -> &DescriptorPublicKey { &self.0 }
 }
 
 #[cfg(feature = "serde")]