From 7faab2072c3048b8b4384ca46041e3e9112e4ff1 Mon Sep 17 00:00:00 2001
From: Jack May <jack@solana.com>
Date: Tue, 28 Jan 2020 17:03:37 -0800
Subject: [PATCH] Cleanup BPF use syntax (#8001)

---
 programs/bpf/benches/bpf_loader.rs |  7 +----
 programs/bpf/build.rs              |  4 +--
 programs/bpf/tests/programs.rs     | 49 ++++++++++++++++--------------
 3 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/programs/bpf/benches/bpf_loader.rs b/programs/bpf/benches/bpf_loader.rs
index 1dd982db2..46e970368 100644
--- a/programs/bpf/benches/bpf_loader.rs
+++ b/programs/bpf/benches/bpf_loader.rs
@@ -4,12 +4,7 @@ extern crate test;
 
 use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
 use solana_rbpf::EbpfVm;
-use std::env;
-use std::fs::File;
-use std::io::Error;
-use std::io::Read;
-use std::mem;
-use std::path::PathBuf;
+use std::{env, fs::File, io::Error, io::Read, mem, path::PathBuf};
 use test::Bencher;
 
 /// BPF program file extension
diff --git a/programs/bpf/build.rs b/programs/bpf/build.rs
index 6ce572d7a..3f90938ad 100644
--- a/programs/bpf/build.rs
+++ b/programs/bpf/build.rs
@@ -1,8 +1,6 @@
 extern crate walkdir;
 
-use std::env;
-use std::path::Path;
-use std::process::Command;
+use std::{env, path::Path, process::Command};
 use walkdir::WalkDir;
 
 fn rerun_if_changed(files: &[&str], directories: &[&str], excludes: &[&str]) {
diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index 84edcd35d..3676f204f 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1,12 +1,12 @@
 #[cfg(any(feature = "bpf_c", feature = "bpf_rust"))]
 mod bpf {
-    use solana_runtime::bank::Bank;
-    use solana_runtime::bank_client::BankClient;
-    use solana_runtime::genesis_utils::{create_genesis_config, GenesisConfigInfo};
-    use solana_runtime::loader_utils::load_program;
-    use std::env;
-    use std::fs::File;
-    use std::path::PathBuf;
+    use solana_runtime::{
+        bank::Bank,
+        bank_client::BankClient,
+        genesis_utils::{create_genesis_config, GenesisConfigInfo},
+        loader_utils::load_program,
+    };
+    use std::{env, fs::File, path::PathBuf};
 
     /// BPF program file extension
     const PLATFORM_FILE_EXTENSION_BPF: &str = "so";
@@ -27,14 +27,15 @@ mod bpf {
     mod bpf_c {
         use super::*;
         use solana_runtime::loader_utils::create_invoke_instruction;
-        use solana_sdk::account::Account;
-        use solana_sdk::bpf_loader;
-        use solana_sdk::client::SyncClient;
-        use solana_sdk::instruction::{AccountMeta, Instruction};
-        use solana_sdk::signature::KeypairUtil;
-        use std::io::Read;
-        use std::sync::Arc;
-        use solana_sdk::pubkey::Pubkey;
+        use solana_sdk::{
+            account::Account,
+            bpf_loader,
+            client::SyncClient,
+            instruction::{AccountMeta, Instruction},
+            pubkey::Pubkey,
+            signature::KeypairUtil,
+        };
+        use std::{io::Read, sync::Arc};
 
         #[test]
         fn test_program_bpf_c() {
@@ -156,14 +157,16 @@ mod bpf {
     #[cfg(feature = "bpf_rust")]
     mod bpf_rust {
         use super::*;
-        use solana_sdk::account::Account;
-        use solana_sdk::bpf_loader;
-        use solana_sdk::client::SyncClient;
-        use solana_sdk::clock::DEFAULT_SLOTS_PER_EPOCH;
-        use solana_sdk::instruction::{AccountMeta, Instruction};
-        use solana_sdk::pubkey::Pubkey;
-        use solana_sdk::signature::{Keypair, KeypairUtil};
-        use solana_sdk::sysvar::{clock, fees, rent, rewards, slot_hashes, stake_history};
+        use solana_sdk::{
+            account::Account,
+            bpf_loader,
+            client::SyncClient,
+            clock::DEFAULT_SLOTS_PER_EPOCH,
+            instruction::{AccountMeta, Instruction},
+            pubkey::Pubkey,
+            signature::{Keypair, KeypairUtil},
+            sysvar::{clock, fees, rent, rewards, slot_hashes, stake_history},
+        };
         use std::io::Read;
         use std::sync::Arc;