modernize rustfmt::skip syntax and run cargo fmt

apoelstra · apoelstra · commit 9eff24170775 · 2025-07-03T22:44:24.000Z
diff --git a/contrib/test.sh b/contrib/test.sh
@@ -17,7 +17,7 @@ fi
 if [ "$DO_FMT" = true ]
 then
     rustup component add rustfmt
-    cargo fmt -- --check
+    cargo fmt --check
 fi
 
 # Pin dependencies required to build with Rust 1.48.0
diff --git a/examples/sign_multisig.rs b/examples/sign_multisig.rs
@@ -93,8 +93,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(&[
diff --git a/examples/verify_tx.rs b/examples/verify_tx.rs
@@ -104,9 +104,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,
diff --git a/src/miniscript/mod.rs b/src/miniscript/mod.rs
@@ -69,7 +69,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.
@@ -623,12 +622,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>;
diff --git a/src/miniscript/ms_tests.rs b/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");
diff --git a/src/miniscript/types/extra_props.rs b/src/miniscript/types/extra_props.rs
@@ -160,7 +160,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,
         }
     }
 
@@ -176,7 +176,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,
         }
     }
 
@@ -398,7 +398,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,
         })
     }
 
@@ -414,7 +414,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,
         })
     }
 
@@ -430,7 +430,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,
         })
     }
 
@@ -449,7 +449,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,
         })
     }
 
@@ -466,7 +466,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,
         })
     }
 
@@ -482,7 +482,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,
         })
     }
 
@@ -499,7 +499,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,
         })
     }
 
@@ -540,7 +540,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,
         })
     }
 
@@ -564,7 +564,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,
         })
     }
 
@@ -604,7 +604,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,
         })
     }
 
@@ -642,7 +642,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)
     }
@@ -674,7 +674,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,
         })
     }
 
@@ -721,7 +721,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,
         })
     }
 
@@ -764,7 +764,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,
         })
     }
 
@@ -885,7 +885,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,
         })
     }
 

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,8 @@ fn spending_transaction() -> bitcoin::Transaction {`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
	`96`	`+#[rustfmt::skip]`
`96`	`97`	`fn list_of_three_arbitrary_public_keys() -> Vec<bitcoin::PublicKey> {`
`97`		`- #[cfg_attr(feature="cargo-fmt", rustfmt_skip)]`
`98`	`98`	`vec![`
`99`	`99`	`bitcoin::PublicKey::from_slice(&[2; 33]).expect("key 1"),`
`100`	`100`	`bitcoin::PublicKey::from_slice(&[`