cargo fmt

Author: apoelstra

src/descriptor/key.rs

@@ -939,12 +939,9 @@ impl<K: InnerXKey> DescriptorXKey<K> {
         let (fingerprint, path) = keysource;
 
         let (compare_fingerprint, compare_path) = match self.origin {
-            Some((fingerprint, ref path)) => (
-                fingerprint,
-                path.into_iter()
-                    .chain(&self.derivation_path)
-                    .collect(),
-            ),
+            Some((fingerprint, ref path)) => {
+                (fingerprint, path.into_iter().chain(&self.derivation_path).collect())
+            }
             None => (
                 self.xkey.xkey_fingerprint(secp),
                 self.derivation_path.into_iter().collect::<Vec<_>>(),

src/descriptor/tr.rs

@@ -90,9 +90,7 @@ impl<Pk: MiniscriptKey> PartialEq for Tr<Pk> {
 impl<Pk: MiniscriptKey> Eq for Tr<Pk> {}
 
 impl<Pk: MiniscriptKey> PartialOrd for Tr<Pk> {
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
-        Some(self.cmp(other))
-    }
+    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> { Some(self.cmp(other)) }
 }
 
 impl<Pk: MiniscriptKey> Ord for Tr<Pk> {

src/lib.rs

@@ -811,7 +811,6 @@ mod tests {
     }
 }
 
-
 #[allow(unused_imports)] // this is an internal prelude module; not all imports are used with every feature combination
 mod prelude {
     // Mutex implementation from LDK

src/miniscript/types/extra_props.rs

@@ -828,17 +828,16 @@ impl Property for ExtData {
                 });
 
         ops_count_sat_vec.sort_by(sat_minus_dissat);
-        let op_count_sat =
-            ops_count_sat_vec
-                .iter()
-                .enumerate()
-                .try_fold(0, |acc, (i, &(x, y))| {
-                    if i <= k {
-                        x.map(|x| acc + x)
-                    } else {
-                        Some(acc + y)
-                    }
-                });
+        let op_count_sat = ops_count_sat_vec
+            .iter()
+            .enumerate()
+            .try_fold(0, |acc, (i, &(x, y))| {
+                if i <= k {
+                    x.map(|x| acc + x)
+                } else {
+                    Some(acc + y)
+                }
+            });
 
         Ok(ExtData {
             pk_cost: pk_cost + n - 1, //all pk cost + (n-1)*ADD

src/plan.rs

@@ -723,12 +723,9 @@ impl Assets {
     fn append(&mut self, b: Self) {
         self.keys.extend(b.keys);
         self.sha256_preimages.extend(b.sha256_preimages);
-        self.hash256_preimages
-            .extend(b.hash256_preimages);
-        self.ripemd160_preimages
-            .extend(b.ripemd160_preimages);
-        self.hash160_preimages
-            .extend(b.hash160_preimages);
+        self.hash256_preimages.extend(b.hash256_preimages);
+        self.ripemd160_preimages.extend(b.ripemd160_preimages);
+        self.hash160_preimages.extend(b.hash160_preimages);
 
         self.relative_timelock = b.relative_timelock.or(self.relative_timelock);
         self.absolute_timelock = b.absolute_timelock.or(self.absolute_timelock);