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

This reverts commit d7377d4794.

program-test/src/lib.rs

@@ -1,6 +1,10 @@
 //! The solana-program-test provides a BanksClient-based test framework BPF programs
 #![allow(clippy::integer_arithmetic)]
 
+// Export types so test clients can limit their solana crate dependencies
+pub use solana_banks_client::BanksClient;
+// Export tokio for test clients
+pub use tokio;
 use {
     async_trait::async_trait,
     chrono_humanize::{Accuracy, HumanTime, Tense},
@@ -23,8 +27,7 @@ use {
         fee_calculator::{FeeCalculator, FeeRateGovernor},
         genesis_config::{ClusterType, GenesisConfig},
         hash::Hash,
-        instruction::Instruction,
-        instruction::InstructionError,
+        instruction::{Instruction, InstructionError},
         message::Message,
         native_token::sol_to_lamports,
         poh_config::PohConfig,
@@ -61,12 +64,6 @@ use {
     tokio::task::JoinHandle,
 };
 
-// Export types so test clients can limit their solana crate dependencies
-pub use solana_banks_client::BanksClient;
-
-// Export tokio for test clients
-pub use tokio;
-
 pub mod programs;
 
 #[macro_use]

program-test/tests/builtins.rs

@@ -1,11 +1,12 @@
-use solana_sdk::{
-    bpf_loader_upgradeable::{self, UpgradeableLoaderState},
-    signature::{Keypair, Signer},
-    transaction::Transaction,
+use {
+    solana_program_test::ProgramTest,
+    solana_sdk::{
+        bpf_loader_upgradeable::{self, UpgradeableLoaderState},
+        signature::{Keypair, Signer},
+        transaction::Transaction,
+    },
 };
 
-use solana_program_test::ProgramTest;
-
 #[tokio::test]
 async fn test_bpf_loader_upgradable_present() {
     // Arrange

program-test/tests/fuzz.rs

@@ -2,8 +2,15 @@ use {
     solana_banks_client::BanksClient,
     solana_program_test::{processor, ProgramTest},
     solana_sdk::{
-        account_info::AccountInfo, entrypoint::ProgramResult, hash::Hash, instruction::Instruction,
-        msg, pubkey::Pubkey, rent::Rent, signature::Keypair, signature::Signer, system_instruction,
+        account_info::AccountInfo,
+        entrypoint::ProgramResult,
+        hash::Hash,
+        instruction::Instruction,
+        msg,
+        pubkey::Pubkey,
+        rent::Rent,
+        signature::{Keypair, Signer},
+        system_instruction,
         transaction::Transaction,
     },
 };