fmt fixes

Author: sanket1729

contrib/test.sh

@@ -46,5 +46,5 @@ fi
 # Bench if told to
 if [ "$DO_BENCH" = true ]
 then
-    cargo bench --features unstable
+    cargo bench --features="unstable compiler"
 fi

fuzz/Cargo.toml

@@ -43,8 +43,4 @@ path = "fuzz_targets/roundtrip_semantic.rs"
 
 [[bin]]
 name = "compile_descriptor"
-path = "fuzz_targets/compile_descriptor.rs"
-
-[[bin]]
-name = "roundtrip_policy"
-path = "fuzz_targets/roundtrip_policy.rs"
+path = "fuzz_targets/compile_descriptor.rs"

src/descriptor/mod.rs

@@ -489,7 +489,7 @@ where
     fn deserialize<D: de::Deserializer<'de>>(d: D) -> Result<Descriptor<Pk>, D::Error> {
         use std::marker::PhantomData;
 
-        struct StrVisitor<Qk>(PhantomData<(Qk)>);
+        struct StrVisitor<Qk>(PhantomData<Qk>);
 
         impl<'de, Qk> de::Visitor<'de> for StrVisitor<Qk>
         where

src/lib.rs

@@ -81,7 +81,6 @@
 //!
 //!
 #![allow(bare_trait_objects)]
-
 #![cfg_attr(all(test, feature = "unstable"), feature(test))]
 pub extern crate bitcoin;
 #[cfg(feature = "serde")]

src/policy/compiler.rs

@@ -1399,9 +1399,10 @@ mod benches {
     #[bench]
     pub fn compile(bh: &mut Bencher) {
         let h = (0..64).map(|_| "a").collect::<String>();
-        let desc = Concrete::<DummyKey>::from_str(
-            &format!("and(thresh(2,and(sha256({}),or(sha256({}),pk())),pk(),pk(),pk(),sha256({})),pk())", h, h, h)
-        )
+        let desc = Concrete::<DummyKey>::from_str(&format!(
+            "and(thresh(2,and(sha256({}),or(sha256({}),pk())),pk(),pk(),pk(),sha256({})),pk())",
+            h, h, h
+        ))
         .expect("parsing");
         bh.iter(|| {
             let pt = desc.compile();
@@ -1431,4 +1432,4 @@ mod benches {
             black_box(pt).unwrap();
         });
     }
-}
+}