modernize rustfmt::skip syntax and run cargo fmt

Weird that this only has an effect on a couple files, which aren't checked
in the Github CI. Same story with 12.x.

Author: apoelstra

contrib/test.sh

@@ -11,7 +11,7 @@ rustc --version
 if [ "$DO_FMT" = true ]
 then
     rustup component add rustfmt
-    cargo fmt -- --check
+    cargo fmt --check
 fi
 
 cp Cargo-recent.lock Cargo.lock

examples/sign_multisig.rs

@@ -105,8 +105,8 @@ fn spending_transaction() -> bitcoin::Transaction {
     }
 }
 
+#[rustfmt::skip]
 fn list_of_three_arbitrary_public_keys() -> Vec<bitcoin::PublicKey> {
-    #[cfg_attr(feature="cargo-fmt", rustfmt_skip)]
     vec![
         bitcoin::PublicKey::from_slice(&[2; 33]).expect("key 1"),
         bitcoin::PublicKey::from_slice(&[

examples/verify_tx.rs

@@ -116,9 +116,9 @@ fn main() {
 }
 
 /// Returns an arbitrary transaction.
+#[rustfmt::skip]
 fn hard_coded_transaction() -> bitcoin::Transaction {
     // tx `f27eba163c38ad3f34971198687a3f1882b7ec818599ffe469a8440d82261c98`
-    #[cfg_attr(feature="cargo-fmt", rustfmt_skip)]
     let tx_bytes = vec![
         0x01, 0x00, 0x00, 0x00, 0x02, 0xc5, 0x11, 0x1d, 0xb7, 0x93, 0x50, 0xc1,
         0x70, 0x28, 0x41, 0x39, 0xe8, 0xe3, 0x4e, 0xb0, 0xed, 0xba, 0x64, 0x7b,

src/lib.rs

@@ -394,7 +394,10 @@ impl<E> TranslateErr<E> {
         match self {
             Self::TranslatorErr(v) => v,
             Self::OuterError(ref e) => {
-                panic!("Unexpected Miniscript error when translating: {}\nMessage: {}", e, msg)
+                panic!(
+                    "Unexpected Miniscript error when translating: {}\nMessage: {}",
+                    e, msg
+                )
             }
         }
     }

src/miniscript/decode.rs

@@ -18,11 +18,10 @@ use sync::Arc;
 use crate::miniscript::lex::{Token as Tk, TokenIter};
 use crate::miniscript::limits::MAX_PUBKEYS_PER_MULTISIG;
 use crate::miniscript::ScriptContext;
-use crate::{prelude::*, Miniscript};
+use crate::prelude::*;
 #[cfg(doc)]
 use crate::Descriptor;
-use crate::{bitcoin, hash256, AbsLockTime, Error, MiniscriptKey, ToPublicKey};
-
+use crate::{bitcoin, hash256, AbsLockTime, Error, Miniscript, MiniscriptKey, ToPublicKey};
 
 /// Trait for parsing keys from byte slices
 pub trait ParseableKey: Sized + ToPublicKey + private::Sealed {

src/miniscript/mod.rs

@@ -66,7 +66,6 @@ mod private {
         phantom: PhantomData<Ctx>,
     }
     impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
-
         /// Add type information(Type and Extdata) to Miniscript based on
         /// `AstElem` fragment. Dependent on display and clone because of Error
         /// Display code of type_check.
@@ -98,7 +97,12 @@ mod private {
             ty: types::Type,
             ext: types::extra_props::ExtData,
         ) -> Miniscript<Pk, Ctx> {
-            Miniscript { node, ty, ext, phantom: PhantomData }
+            Miniscript {
+                node,
+                ty,
+                ext,
+                phantom: PhantomData,
+            }
         }
     }
 }
@@ -156,7 +160,6 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> fmt::Display for Miniscript<Pk, Ctx>
 }
 
 impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
-    
     /// Extracts the `AstElem` representing the root of the miniscript
     pub fn into_inner(self) -> Terminal<Pk, Ctx> {
         self.node
@@ -495,12 +498,11 @@ mod tests {
     use sync::Arc;
 
     use super::{Miniscript, ScriptContext, Segwitv0, Tap};
-    use crate::miniscript::types;
-    use crate::miniscript::Terminal;
+    use crate::miniscript::{types, Terminal};
     use crate::policy::Liftable;
-    use crate::{prelude::*, Error};
+    use crate::prelude::*;
     use crate::test_utils::{StrKeyTranslator, StrXOnlyKeyTranslator};
-    use crate::{hex_script, ExtParams, Satisfier, ToPublicKey, TranslatePk};
+    use crate::{hex_script, Error, ExtParams, Satisfier, ToPublicKey, TranslatePk};
 
     type Segwitv0Script = Miniscript<bitcoin::PublicKey, Segwitv0>;
     type Tapscript = Miniscript<bitcoin::secp256k1::XOnlyPublicKey, Tap>;

src/miniscript/ms_tests.rs

@@ -68,7 +68,7 @@ mod tests {
     }
 
     #[test]
-    #[cfg_attr(feature="cargo-fmt", rustfmt_skip)]
+    #[rustfmt::skip]
     fn invalid_tests_from_alloy() {
         invalid_ms("or_b(or_i(0,sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))");
         invalid_ms("or_b(s:pk_h(A),after(500000001))");
@@ -5646,7 +5646,7 @@ mod tests {
         invalid_ms("c:or_b(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),pk_k(A))");
     }
     #[test]
-    #[cfg_attr(feature="cargo-fmt", rustfmt_skip)]
+    #[rustfmt::skip]
     fn mall_8f1e8_tests_from_alloy() {
         ms_test("or_d(or_d(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(500000001))", "Bf");
         ms_test("andor(sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc),or_d(multi(2,A,B,C),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),after(1))", "B");
@@ -9143,7 +9143,7 @@ mod tests {
 
     }
     #[test]
-    #[cfg_attr(feature="cargo-fmt", rustfmt_skip)]
+    #[rustfmt::skip]
     fn main_tests_from_alloy() {
         ms_test("or_d(or_d(multi(2,A,B,C),or_d(multi(2,D,E,F),multi(2,G,I,J))),multi(2,K,L,M))", "Bdusem");
         ms_test("andor(multi(2,A,B,C),or_d(multi(2,D,E,F),sha256(926a54995ca48600920a19bf7bc502ca5f2f7d07e6f804c4f00ebf0325084dbc)),c:pk_h(G))", "Bdusem");
@@ -15044,7 +15044,7 @@ mod tests {
 }
 
     #[test]
-    #[cfg_attr(feature="cargo-fmt", rustfmt_skip)]
+    #[rustfmt::skip]
     fn malleable_tests_from_alloy() {
         ms_test("and_v(v:after(500000001),or_d(j:multi(2,A,B,C),multi(2,D,E,F)))", "usB");
         ms_test("or_b(j:multi(2,A,B,C),a:andor(multi(2,D,E,F),multi(2,G,I,J),multi(2,K,L,M)))", "dBesu");
@@ -22076,8 +22076,8 @@ mod tests {
     // This does not actually test timelock mixing. See: https://github.com/rust-bitcoin/rust-miniscript/issues/514
     // for details
     #[test]
+    #[rustfmt::skip]
     fn conflict_tests_from_alloy() {
-        #[cfg_attr(feature="cargo-fmt", rustfmt_skip)]
         {
             ms_test("andor(multi(2,A,B,C),andor(multi(2,D,E,F),after(500000001),n:after(1)),0)","Bedsm");
             ms_test("and_v(v:after(500000001),or_d(multi(2,A,B,C),and_b(multi(2,D,E,F),a:after(1))))","Busm");

src/miniscript/types/extra_props.rs

@@ -168,7 +168,7 @@ impl Property for ExtData {
             timelock_info: TimelockInfo::default(),
             exec_stack_elem_count_sat: Some(1),
             exec_stack_elem_count_dissat: None,
-            tree_height : 0,
+            tree_height: 0,
         }
     }
 
@@ -184,7 +184,7 @@ impl Property for ExtData {
             timelock_info: TimelockInfo::default(),
             exec_stack_elem_count_sat: None,
             exec_stack_elem_count_dissat: Some(1),
-            tree_height : 0,
+            tree_height: 0,
         }
     }
 
@@ -408,7 +408,7 @@ impl Property for ExtData {
             timelock_info: self.timelock_info,
             exec_stack_elem_count_sat: self.exec_stack_elem_count_sat,
             exec_stack_elem_count_dissat: self.exec_stack_elem_count_dissat,
-            tree_height : self.tree_height + 1,
+            tree_height: self.tree_height + 1,
         })
     }
 
@@ -424,7 +424,7 @@ impl Property for ExtData {
             timelock_info: self.timelock_info,
             exec_stack_elem_count_sat: self.exec_stack_elem_count_sat,
             exec_stack_elem_count_dissat: self.exec_stack_elem_count_dissat,
-            tree_height : self.tree_height + 1,
+            tree_height: self.tree_height + 1,
         })
     }
 
@@ -440,7 +440,7 @@ impl Property for ExtData {
             timelock_info: self.timelock_info,
             exec_stack_elem_count_sat: self.exec_stack_elem_count_sat,
             exec_stack_elem_count_dissat: self.exec_stack_elem_count_dissat,
-            tree_height : self.tree_height + 1,
+            tree_height: self.tree_height + 1,
         })
     }
 
@@ -459,7 +459,7 @@ impl Property for ExtData {
             // Even all V types push something onto the stack and then remove them
             exec_stack_elem_count_sat: self.exec_stack_elem_count_sat,
             exec_stack_elem_count_dissat: Some(1),
-            tree_height : self.tree_height + 1,
+            tree_height: self.tree_height + 1,
         })
     }
 
@@ -476,7 +476,7 @@ impl Property for ExtData {
             timelock_info: self.timelock_info,
             exec_stack_elem_count_sat: self.exec_stack_elem_count_sat,
             exec_stack_elem_count_dissat: None,
-            tree_height : self.tree_height + 1,
+            tree_height: self.tree_height + 1,
         })
     }
 
@@ -492,7 +492,7 @@ impl Property for ExtData {
             timelock_info: self.timelock_info,
             exec_stack_elem_count_sat: self.exec_stack_elem_count_sat,
             exec_stack_elem_count_dissat: Some(1),
-            tree_height : self.tree_height + 1,
+            tree_height: self.tree_height + 1,
         })
     }
 
@@ -509,7 +509,7 @@ impl Property for ExtData {
             // Technically max(1, self.exec_stack_elem_count_sat), same rationale as cast_dupif
             exec_stack_elem_count_sat: self.exec_stack_elem_count_sat,
             exec_stack_elem_count_dissat: self.exec_stack_elem_count_dissat,
-            tree_height : self.tree_height + 1,
+            tree_height: self.tree_height + 1,
         })
     }
 
@@ -550,7 +550,7 @@ impl Property for ExtData {
                 l.exec_stack_elem_count_dissat,
                 r.exec_stack_elem_count_dissat.map(|x| x + 1),
             ),
-            tree_height : cmp::max(l.tree_height, r.tree_height) + 1,
+            tree_height: cmp::max(l.tree_height, r.tree_height) + 1,
         })
     }
 
@@ -578,7 +578,7 @@ impl Property for ExtData {
                 r.exec_stack_elem_count_sat,
             ),
             exec_stack_elem_count_dissat: None,
-            tree_height : cmp::max(l.tree_height, r.tree_height) + 1,
+            tree_height: cmp::max(l.tree_height, r.tree_height) + 1,
         })
     }
 
@@ -627,7 +627,7 @@ impl Property for ExtData {
                 l.exec_stack_elem_count_dissat,
                 r.exec_stack_elem_count_dissat.map(|x| x + 1),
             ),
-            tree_height : cmp::max(l.tree_height, r.tree_height) + 1,
+            tree_height: cmp::max(l.tree_height, r.tree_height) + 1,
         })
     }
 
@@ -665,7 +665,7 @@ impl Property for ExtData {
                 l.exec_stack_elem_count_dissat,
                 r.exec_stack_elem_count_dissat.map(|x| x + 1),
             ),
-            tree_height : cmp::max(l.tree_height, r.tree_height) + 1,
+            tree_height: cmp::max(l.tree_height, r.tree_height) + 1,
         };
         Ok(res)
     }
@@ -697,7 +697,7 @@ impl Property for ExtData {
                 opt_max(r.exec_stack_elem_count_sat, l.exec_stack_elem_count_dissat),
             ),
             exec_stack_elem_count_dissat: None,
-            tree_height : cmp::max(l.tree_height, r.tree_height) + 1,
+            tree_height: cmp::max(l.tree_height, r.tree_height) + 1,
         })
     }
 
@@ -744,7 +744,7 @@ impl Property for ExtData {
                 l.exec_stack_elem_count_dissat,
                 r.exec_stack_elem_count_dissat,
             ),
-            tree_height : cmp::max(l.tree_height, r.tree_height) + 1,
+            tree_height: cmp::max(l.tree_height, r.tree_height) + 1,
         })
     }
 
@@ -790,7 +790,7 @@ impl Property for ExtData {
                 a.exec_stack_elem_count_dissat,
                 c.exec_stack_elem_count_dissat,
             ),
-            tree_height : cmp::max(a.tree_height, cmp::max(b.tree_height, c.tree_height)) + 1,
+            tree_height: cmp::max(a.tree_height, cmp::max(b.tree_height, c.tree_height)) + 1,
         })
     }
 
@@ -916,7 +916,7 @@ impl Property for ExtData {
             timelock_info: TimelockInfo::combine_threshold(k, timelocks),
             exec_stack_elem_count_sat,
             exec_stack_elem_count_dissat,
-            tree_height : max_child_height + 1,
+            tree_height: max_child_height + 1,
         })
     }