Revert "Revert "Reformat imports to a consistent style for imports""

This reverts commit d7377d4794.

clap-utils/src/input_parsers.rs

@@ -196,10 +196,12 @@ pub fn commitment_of(matches: &ArgMatches<'_>, name: &str) -> Option<CommitmentC
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use clap::{App, Arg};
-    use solana_sdk::signature::write_keypair_file;
-    use std::fs;
+    use {
+        super::*,
+        clap::{App, Arg},
+        solana_sdk::signature::write_keypair_file,
+        std::fs,
+    };
 
     fn app<'ab, 'v>() -> App<'ab, 'v> {
         App::new("test")

clap-utils/src/input_validators.rs

@@ -7,8 +7,7 @@ use {
         pubkey::{Pubkey, MAX_SEED_LEN},
         signature::{read_keypair_file, Signature},
     },
-    std::fmt::Display,
-    std::str::FromStr,
+    std::{fmt::Display, str::FromStr},
 };
 
 fn is_parsable_generic<U, T>(string: T) -> Result<(), String>

clap-utils/src/keypair.rs

@@ -1123,14 +1123,14 @@ fn sanitize_seed_phrase(seed_phrase: &str) -> String {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use crate::offline::OfflineArgs;
-    use clap::{value_t_or_exit, App, Arg};
-    use solana_remote_wallet::locator::Manufacturer;
-    use solana_remote_wallet::remote_wallet::initialize_wallet_manager;
-    use solana_sdk::signer::keypair::write_keypair_file;
-    use solana_sdk::system_instruction;
-    use tempfile::{NamedTempFile, TempDir};
+    use {
+        super::*,
+        crate::offline::OfflineArgs,
+        clap::{value_t_or_exit, App, Arg},
+        solana_remote_wallet::{locator::Manufacturer, remote_wallet::initialize_wallet_manager},
+        solana_sdk::{signer::keypair::write_keypair_file, system_instruction},
+        tempfile::{NamedTempFile, TempDir},
+    };
 
     #[test]
     fn test_sanitize_seed_phrase() {