cargo fmt new workspaces (bitcoin-tests, fuzz)

Also fmt embedded, since in an earlier iteration of this PR, it was a
new workspace. (Total diff: 2 lines.)

Author: apoelstra

bitcoind-tests/tests/setup/mod.rs

@@ -18,7 +18,10 @@ pub fn setup() -> BitcoinD {
             }
         }
 
-        let bitcoind_path = root_path.join("bitcoind-tests").join("bin").join("bitcoind");
+        let bitcoind_path = root_path
+            .join("bitcoind-tests")
+            .join("bin")
+            .join("bitcoind");
         std::env::set_var(key, bitcoind_path);
     }
 

bitcoind-tests/tests/setup/test_util.rs

@@ -19,15 +19,14 @@
 
 use std::str::FromStr;
 
-use miniscript::bitcoin;
 use actual_rand as rand;
 use bitcoin::hashes::hex::ToHex;
 use bitcoin::hashes::{hash160, ripemd160, sha256, Hash};
 use bitcoin::secp256k1;
 use miniscript::descriptor::{SinglePub, SinglePubKey};
 use miniscript::{
-    hash256, Descriptor, DescriptorPublicKey, Error, Miniscript, ScriptContext, TranslatePk,
-    Translator,
+    bitcoin, hash256, Descriptor, DescriptorPublicKey, Error, Miniscript, ScriptContext,
+    TranslatePk, Translator,
 };
 use rand::RngCore;
 

bitcoind-tests/tests/test_cpp.rs

@@ -15,9 +15,8 @@ use bitcoin::util::psbt;
 use bitcoin::util::psbt::PartiallySignedTransaction as Psbt;
 use bitcoin::{Amount, LockTime, OutPoint, Sequence, Transaction, TxIn, TxOut, Txid};
 use bitcoind::bitcoincore_rpc::{json, Client, RpcApi};
-use miniscript::bitcoin;
 use miniscript::psbt::PsbtExt;
-use miniscript::Descriptor;
+use miniscript::{bitcoin, Descriptor};
 
 mod setup;
 use setup::test_util::{self, PubData, TestData};

bitcoind-tests/tests/test_desc.rs

@@ -7,7 +7,6 @@
 use std::collections::BTreeMap;
 use std::{error, fmt};
 
-use miniscript::bitcoin;
 use actual_rand as rand;
 use bitcoin::blockdata::witness::Witness;
 use bitcoin::hashes::{sha256d, Hash};
@@ -16,12 +15,12 @@ use bitcoin::util::sighash::SighashCache;
 use bitcoin::util::taproot::{LeafVersion, TapLeafHash};
 use bitcoin::util::{psbt, sighash};
 use bitcoin::{
-    secp256k1, Amount, LockTime, OutPoint, SchnorrSig, Script, Sequence, Transaction, TxIn,
-    TxOut, Txid,
+    secp256k1, Amount, LockTime, OutPoint, SchnorrSig, Script, Sequence, Transaction, TxIn, TxOut,
+    Txid,
 };
 use bitcoind::bitcoincore_rpc::{json, Client, RpcApi};
 use miniscript::psbt::{PsbtExt, PsbtInputExt};
-use miniscript::{Descriptor, Miniscript, ScriptContext, ToPublicKey};
+use miniscript::{bitcoin, Descriptor, Miniscript, ScriptContext, ToPublicKey};
 mod setup;
 
 use rand::RngCore;

embedded/src/main.rs

@@ -8,11 +8,9 @@ extern crate alloc;
 use alloc::string::ToString;
 use core::alloc::Layout;
 use core::panic::PanicInfo;
-
-use alloc_cortex_m::CortexMHeap;
-
 use core::str::FromStr;
 
+use alloc_cortex_m::CortexMHeap;
 use cortex_m::asm;
 use cortex_m_rt::entry;
 use cortex_m_semihosting::{debug, hprintln};

fuzz/fuzz_targets/compile_descriptor.rs

@@ -1,11 +1,10 @@
 extern crate miniscript;
 
-use miniscript::Segwitv0;
-use miniscript::{policy, Miniscript};
-use policy::Liftable;
-
 use std::str::FromStr;
 
+use miniscript::{policy, Miniscript, Segwitv0};
+use policy::Liftable;
+
 type Script = Miniscript<String, Segwitv0>;
 type Policy = policy::Concrete<String>;
 
@@ -15,7 +14,10 @@ fn do_test(data: &[u8]) {
         // Compile
         if let Ok(desc) = pol.compile::<Segwitv0>() {
             // Lift
-            assert_eq!(desc.clone().lift().unwrap().sorted(), pol.clone().lift().unwrap().sorted());
+            assert_eq!(
+                desc.clone().lift().unwrap().sorted(),
+                pol.clone().lift().unwrap().sorted()
+            );
             // Try to roundtrip the output of the compiler
             let output = desc.to_string();
             if let Ok(desc) = Script::from_str(&output) {

fuzz/fuzz_targets/parse_descriptor.rs

@@ -1,8 +1,9 @@
 extern crate miniscript;
 
-use miniscript::DescriptorPublicKey;
 use std::str::FromStr;
 
+use miniscript::DescriptorPublicKey;
+
 fn do_test(data: &[u8]) {
     let data_str = String::from_utf8_lossy(data);
     if let Ok(dpk) = DescriptorPublicKey::from_str(&data_str) {

fuzz/fuzz_targets/parse_descriptor_secret.rs

@@ -1,8 +1,9 @@
 extern crate miniscript;
 
-use miniscript::descriptor::DescriptorSecretKey;
 use std::str::FromStr;
 
+use miniscript::descriptor::DescriptorSecretKey;
+
 fn do_test(data: &[u8]) {
     let data_str = String::from_utf8_lossy(data);
     if let Ok(dsk) = DescriptorSecretKey::from_str(&data_str) {

fuzz/fuzz_targets/roundtrip_concrete.rs

@@ -1,8 +1,9 @@
 extern crate miniscript;
 extern crate regex;
+use std::str::FromStr;
+
 use miniscript::policy;
 use regex::Regex;
-use std::str::FromStr;
 
 type Policy = policy::Concrete<String>;
 

fuzz/fuzz_targets/roundtrip_descriptor.rs

@@ -1,9 +1,10 @@
 extern crate miniscript;
 extern crate regex;
 
+use std::str::FromStr;
+
 use miniscript::Descriptor;
 use regex::Regex;
-use std::str::FromStr;
 
 fn do_test(data: &[u8]) {
     let s = String::from_utf8_lossy(data);

fuzz/fuzz_targets/roundtrip_miniscript_script.rs

@@ -1,8 +1,7 @@
 extern crate miniscript;
 
 use miniscript::bitcoin::blockdata::script;
-use miniscript::Miniscript;
-use miniscript::Segwitv0;
+use miniscript::{Miniscript, Segwitv0};
 
 fn do_test(data: &[u8]) {
     // Try round-tripping as a script

fuzz/fuzz_targets/roundtrip_miniscript_str.rs

@@ -1,11 +1,10 @@
 extern crate miniscript;
 extern crate regex;
 
-use regex::Regex;
 use std::str::FromStr;
 
-use miniscript::Miniscript;
-use miniscript::Segwitv0;
+use miniscript::{Miniscript, Segwitv0};
+use regex::Regex;
 
 fn do_test(data: &[u8]) {
     let s = String::from_utf8_lossy(data);

fuzz/fuzz_targets/roundtrip_semantic.rs

@@ -1,8 +1,9 @@
 extern crate miniscript;
 
-use miniscript::policy;
 use std::str::FromStr;
 
+use miniscript::policy;
+
 type Policy = policy::Semantic<String>;
 
 fn do_test(data: &[u8]) {