Configure group_imports

Configure `group_imports = "StdExternalCrate"`.

The benefit of this option is that it increases uniformity in the code
base over the default "Preserve", while saving devs needing to think
about where they place their import statements (for those that do not
use tooling to add them).

Author: tcharding

examples/htlc.rs

@@ -17,11 +17,12 @@
 extern crate bitcoin;
 extern crate miniscript;
 
+use std::str::FromStr;
+
 use bitcoin::Network;
 use miniscript::descriptor::Wsh;
 use miniscript::policy::{Concrete, Liftable};
 use miniscript::DescriptorTrait;
-use std::str::FromStr;
 
 fn main() {
     //HTLC policy with 10:1 odds for happy(co-operative) case compared to uncooperative case

examples/parse.rs

@@ -17,9 +17,10 @@
 extern crate bitcoin;
 extern crate miniscript;
 
-use miniscript::{descriptor::DescriptorType, Descriptor, DescriptorTrait};
 use std::str::FromStr;
 
+use miniscript::{descriptor::DescriptorType, Descriptor, DescriptorTrait};
+
 fn main() {
     let my_descriptor = miniscript::Descriptor::<bitcoin::PublicKey>::from_str(
         "wsh(c:pk_k(020202020202020202020202020202020202020202020202020202020202020202))",

examples/sign_multisig.rs

@@ -17,11 +17,12 @@
 extern crate bitcoin;
 extern crate miniscript;
 
+use std::collections::HashMap;
+use std::str::FromStr;
+
 use bitcoin::blockdata::witness::Witness;
 use bitcoin::secp256k1; // secp256k1 re-exported from rust-bitcoin
 use miniscript::DescriptorTrait;
-use std::collections::HashMap;
-use std::str::FromStr;
 
 fn main() {
     // Avoid repeatedly typing a pretty-common descriptor type

examples/verify_tx.rs

@@ -17,11 +17,12 @@
 extern crate bitcoin;
 extern crate miniscript;
 
+use std::str::FromStr;
+
 use bitcoin::consensus::Decodable;
 use bitcoin::util::sighash;
 use bitcoin::{secp256k1, TxOut}; // secp256k1 re-exported from rust-bitcoin
 use miniscript::interpreter::KeySigPair;
-use std::str::FromStr;
 
 fn main() {
     // tx `f27eba163c38ad3f34971198687a3f1882b7ec818599ffe469a8440d82261c98`

examples/xpub_descriptors.rs

@@ -16,10 +16,10 @@
 
 extern crate miniscript;
 
+use std::str::FromStr;
+
 use miniscript::bitcoin::{self, secp256k1};
 use miniscript::{Descriptor, DescriptorPublicKey, DescriptorTrait, TranslatePk2};
-
-use std::str::FromStr;
 fn main() {
     // For deriving from descriptors, we need to provide a secp context
     let secp_ctx = secp256k1::Secp256k1::verification_only();

rustfmt.toml

@@ -28,7 +28,7 @@ where_single_line = false
 imports_indent = "Block"
 imports_layout = "Mixed"
 imports_granularity = "Preserve"
-group_imports = "Preserve"
+group_imports = "StdExternalCrate" # Default "Preserve"
 reorder_imports = true
 reorder_modules = true
 reorder_impl_items = false

src/descriptor/bare.rs

@@ -21,7 +21,6 @@
 use std::{fmt, str::FromStr};
 
 use bitcoin::{self, blockdata::script, Script};
-
 use expression::{self, FromTree};
 use miniscript::context::ScriptContext;
 use policy::{semantic, Liftable};

src/descriptor/checksum.rs

@@ -101,9 +101,10 @@ pub(super) fn verify_checksum(s: &str) -> Result<&str, Error> {
 }
 #[cfg(test)]
 mod test {
-    use super::*;
     use std::str;
 
+    use super::*;
+
     macro_rules! check_expected {
         ($desc: expr, $checksum: expr) => {
             assert_eq!(desc_checksum($desc).unwrap(), $checksum);

src/descriptor/key.rs

@@ -9,7 +9,6 @@ use bitcoin::{
     util::bip32,
     XOnlyPublicKey, XpubIdentifier,
 };
-
 use {MiniscriptKey, ToPublicKey};
 
 /// Single public key without any origin or range information
@@ -719,11 +718,11 @@ impl MiniscriptKey for DescriptorPublicKey {
 
 #[cfg(test)]
 mod test {
-    use super::{DescriptorKeyParseError, DescriptorPublicKey, DescriptorSecretKey};
+    use std::str::FromStr;
 
     use bitcoin::secp256k1;
 
-    use std::str::FromStr;
+    use super::{DescriptorKeyParseError, DescriptorPublicKey, DescriptorSecretKey};
 
     #[test]
     fn parse_descriptor_key_errors() {

src/descriptor/mod.rs

@@ -31,8 +31,6 @@ use std::{
 
 use bitcoin::blockdata::witness::Witness;
 use bitcoin::{self, secp256k1, Script};
-
-use self::checksum::verify_checksum;
 use expression;
 use miniscript;
 use miniscript::{Legacy, Miniscript, Segwitv0};
@@ -41,6 +39,8 @@ use {
     TranslatePk2,
 };
 
+use self::checksum::verify_checksum;
+
 // Directly export from lib.rs, exporting the trait here causes conflicts in this file
 pub(crate) mod pretaproot;
 
@@ -824,9 +824,10 @@ serde_string_impl_pk!(Descriptor, "a script descriptor");
 
 #[cfg(test)]
 mod tests {
-    use super::checksum::desc_checksum;
-    use super::tr::Tr;
-    use super::*;
+    use std::cmp;
+    use std::collections::HashMap;
+    use std::str::FromStr;
+
     use bitcoin::blockdata::opcodes::all::{OP_CLTV, OP_CSV};
     use bitcoin::blockdata::script::Instruction;
     use bitcoin::blockdata::{opcodes, script};
@@ -839,13 +840,13 @@ mod tests {
         DescriptorPublicKey, DescriptorSecretKey, DescriptorSinglePub, DescriptorXKey,
     };
     use hex_script;
-    use std::cmp;
-    use std::collections::HashMap;
-    use std::str::FromStr;
-    use {Descriptor, DummyKey, Error, Miniscript, Satisfier, TranslatePk2};
-
     #[cfg(feature = "compiler")]
     use policy;
+    use {Descriptor, DummyKey, Error, Miniscript, Satisfier, TranslatePk2};
+
+    use super::checksum::desc_checksum;
+    use super::tr::Tr;
+    use super::*;
 
     type StdDescriptor = Descriptor<PublicKey>;
     const TEST_PK: &'static str =