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

This reverts commit d7377d4794.

validator/src/lib.rs

@@ -1,6 +1,4 @@
 #![allow(clippy::integer_arithmetic)]
-pub use solana_core::test_validator;
-pub use solana_gossip::cluster_info::MINIMUM_VALIDATOR_PORT_RANGE_WIDTH;
 use {
     console::style,
     fd_lock::{FdLock, FdLockGuard},
@@ -13,6 +11,9 @@ use {
         thread::JoinHandle,
     },
 };
+pub use {
+    solana_core::test_validator, solana_gossip::cluster_info::MINIMUM_VALIDATOR_PORT_RANGE_WIDTH,
+};
 
 pub mod admin_rpc_service;
 pub mod dashboard;

validator/src/main.rs

@@ -1,4 +1,6 @@
 #![allow(clippy::integer_arithmetic)]
+#[cfg(not(target_env = "msvc"))]
+use jemallocator::Jemalloc;
 use {
     clap::{
         crate_description, crate_name, value_t, value_t_or_exit, values_t, values_t_or_exit, App,
@@ -78,9 +80,6 @@ use {
     },
 };
 
-#[cfg(not(target_env = "msvc"))]
-use jemallocator::Jemalloc;
-
 #[cfg(not(target_env = "msvc"))]
 #[global_allocator]
 static GLOBAL: Jemalloc = Jemalloc;