Add rustfmt.toml and cargo fmt

banks-client/src/lib.rs

@@ -5,8 +5,10 @@
 //! but they are undocumented, may change over time, and are generally more
 //! cumbersome to use.
 
-pub use crate::error::BanksClientError;
-pub use solana_banks_interface::{BanksClient as TarpcClient, TransactionStatus};
+pub use {
+    crate::error::BanksClientError,
+    solana_banks_interface::{BanksClient as TarpcClient, TransactionStatus},
+};
 use {
     borsh::BorshDeserialize,
     futures::{future::join_all, Future, FutureExt, TryFutureExt},

core/benches/sigverify_stage.rs

@@ -9,7 +9,10 @@ use {
     log::*,
     rand::{thread_rng, Rng},
     solana_core::{sigverify::TransactionSigVerifier, sigverify_stage::SigVerifyStage},
-    solana_perf::{packet::to_packet_batches, packet::PacketBatch, test_tx::test_tx},
+    solana_perf::{
+        packet::{to_packet_batches, PacketBatch},
+        test_tx::test_tx,
+    },
     solana_sdk::{
         hash::Hash,
         signature::{Keypair, Signer},

core/src/consensus.rs

@@ -1,9 +1,9 @@
-use crate::tower1_7_14::Tower1_7_14;
 use {
     crate::{
         heaviest_subtree_fork_choice::HeaviestSubtreeForkChoice,
         latest_validator_votes_for_frozen_banks::LatestValidatorVotesForFrozenBanks,
         progress_map::{LockoutIntervals, ProgressMap},
+        tower1_7_14::Tower1_7_14,
         tower_storage::{SavedTower, SavedTowerVersions, TowerStorage},
     },
     chrono::prelude::*,

core/src/sigverify_stage.rs

@@ -11,8 +11,10 @@ use {
     crossbeam_channel::{Receiver, RecvTimeoutError, SendError, Sender},
     itertools::Itertools,
     solana_measure::measure::Measure,
-    solana_perf::packet::PacketBatch,
-    solana_perf::sigverify::{count_valid_packets, shrink_batches, Deduper},
+    solana_perf::{
+        packet::PacketBatch,
+        sigverify::{count_valid_packets, shrink_batches, Deduper},
+    },
     solana_sdk::timing,
     solana_streamer::streamer::{self, PacketBatchReceiver, StreamerError},
     std::{
@@ -370,12 +372,15 @@ impl SigVerifyStage {
 
 #[cfg(test)]
 mod tests {
-    use crate::sigverify::TransactionSigVerifier;
-    use crate::sigverify_stage::timing::duration_as_ms;
-    use crossbeam_channel::unbounded;
-    use solana_perf::packet::to_packet_batches;
-    use solana_perf::test_tx::test_tx;
-    use {super::*, solana_perf::packet::Packet};
+    use {
+        super::*,
+        crate::{sigverify::TransactionSigVerifier, sigverify_stage::timing::duration_as_ms},
+        crossbeam_channel::unbounded,
+        solana_perf::{
+            packet::{to_packet_batches, Packet},
+            test_tx::test_tx,
+        },
+    };
 
     fn count_non_discard(packet_batches: &[PacketBatch]) -> usize {
         packet_batches

core/src/tower1_7_14.rs

@@ -1,11 +1,13 @@
-use crate::consensus::{SwitchForkDecision, TowerError};
-use solana_sdk::{
-    clock::Slot,
-    hash::Hash,
-    pubkey::Pubkey,
-    signature::{Signature, Signer},
+use {
+    crate::consensus::{SwitchForkDecision, TowerError},
+    solana_sdk::{
+        clock::Slot,
+        hash::Hash,
+        pubkey::Pubkey,
+        signature::{Signature, Signer},
+    },
+    solana_vote_program::vote_state::{BlockTimestamp, Vote, VoteState},
 };
-use solana_vote_program::vote_state::{BlockTimestamp, Vote, VoteState};
 
 #[frozen_abi(digest = "7phMrqmBo2D3rXPdhBj8CpjRvvmx9qgpcU4cDGkL3W9q")]
 #[derive(Clone, Serialize, Deserialize, Debug, PartialEq, AbiExample)]

core/src/tower_storage.rs

@@ -1,6 +1,8 @@
 use {
-    crate::consensus::{Result, Tower, TowerError, TowerVersions},
-    crate::tower1_7_14::SavedTower1_7_14,
+    crate::{
+        consensus::{Result, Tower, TowerError, TowerVersions},
+        tower1_7_14::SavedTower1_7_14,
+    },
     solana_sdk::{
         pubkey::Pubkey,
         signature::{Signature, Signer},

core/src/tvu.rs

@@ -417,8 +417,7 @@ pub mod tests {
         solana_runtime::bank::Bank,
         solana_sdk::signature::{Keypair, Signer},
         solana_streamer::socket::SocketAddrSpace,
-        std::sync::atomic::AtomicU64,
-        std::sync::atomic::Ordering,
+        std::sync::atomic::{AtomicU64, Ordering},
     };
 
     #[ignore]

dos/src/main.rs

@@ -271,8 +271,11 @@ fn main() {
 
 #[cfg(test)]
 pub mod test {
-    use solana_local_cluster::{cluster::Cluster, local_cluster::LocalCluster};
-    use {super::*, solana_sdk::timing::timestamp};
+    use {
+        super::*,
+        solana_local_cluster::{cluster::Cluster, local_cluster::LocalCluster},
+        solana_sdk::timing::timestamp,
+    };
 
     #[test]
     fn test_dos() {

perf/src/sigverify.rs

@@ -25,10 +25,13 @@ use {
         short_vec::decode_shortu16_len,
         signature::Signature,
     },
-    std::hash::Hasher,
-    std::sync::atomic::{AtomicBool, AtomicU64, Ordering},
-    std::time::{Duration, Instant},
-    std::{convert::TryFrom, mem::size_of},
+    std::{
+        convert::TryFrom,
+        hash::Hasher,
+        mem::size_of,
+        sync::atomic::{AtomicBool, AtomicU64, Ordering},
+        time::{Duration, Instant},
+    },
 };
 
 // Representing key tKeYE4wtowRb8yRroZShTipE18YVnqwXjsSAoNsFU6g

program-runtime/src/sysvar_cache.rs

@@ -1,7 +1,7 @@
-use crate::invoke_context::InvokeContext;
 #[allow(deprecated)]
 use solana_sdk::sysvar::{fees::Fees, recent_blockhashes::RecentBlockhashes};
 use {
+    crate::invoke_context::InvokeContext,
     solana_sdk::{
         account::{AccountSharedData, ReadableAccount},
         instruction::InstructionError,

programs/address-lookup-table-tests/tests/common.rs

@@ -10,8 +10,7 @@ use {
         account::AccountSharedData,
         clock::Slot,
         hash::Hash,
-        instruction::Instruction,
-        instruction::InstructionError,
+        instruction::{Instruction, InstructionError},
         pubkey::Pubkey,
         signature::{Keypair, Signer},
         slot_hashes::SlotHashes,

programs/address-lookup-table-tests/tests/extend_lookup_table_ix.rs

@@ -10,14 +10,12 @@ use {
     solana_program_test::*,
     solana_sdk::{
         account::ReadableAccount,
-        instruction::Instruction,
-        instruction::InstructionError,
+        instruction::{Instruction, InstructionError},
         pubkey::{Pubkey, PUBKEY_BYTES},
         signature::{Keypair, Signer},
         transaction::{Transaction, TransactionError},
     },
-    std::borrow::Cow,
-    std::result::Result,
+    std::{borrow::Cow, result::Result},
 };
 
 mod common;

programs/address-lookup-table/src/state.rs

@@ -218,8 +218,7 @@ impl<'a> AddressLookupTable<'a> {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use solana_sdk::hash::Hash;
+    use {super::*, solana_sdk::hash::Hash};
 
     impl AddressLookupTable<'_> {
         fn new_for_tests(meta: LookupTableMeta, num_addresses: usize) -> Self {

rpc/src/rpc_pubsub_service.rs

@@ -200,8 +200,7 @@ impl TestBroadcastReceiver {
     }
 
     pub fn recv_timeout(&mut self, timeout: std::time::Duration) -> Result<String, String> {
-        use std::thread::sleep;
-        use tokio::sync::broadcast::error::TryRecvError;
+        use {std::thread::sleep, tokio::sync::broadcast::error::TryRecvError};
 
         let started = std::time::Instant::now();
 

rpc/src/rpc_subscriptions.rs

@@ -1195,8 +1195,8 @@ pub(crate) mod tests {
         },
         serial_test::serial,
         solana_client::rpc_config::{
-            RpcAccountInfoConfig, RpcProgramAccountsConfig, RpcSignatureSubscribeConfig,
-            RpcTransactionLogsFilter, {RpcBlockSubscribeConfig, RpcBlockSubscribeFilter},
+            RpcAccountInfoConfig, RpcBlockSubscribeConfig, RpcBlockSubscribeFilter,
+            RpcProgramAccountsConfig, RpcSignatureSubscribeConfig, RpcTransactionLogsFilter,
         },
         solana_runtime::{
             commitment::BlockCommitment,

runtime/src/bank.rs

@@ -244,8 +244,7 @@ pub struct SquashTiming {
 type EpochCount = u64;
 
 mod executor_cache {
-    use super::*;
-    use log;
+    use {super::*, log};
 
     #[derive(Debug, Default)]
     pub struct Stats {
@@ -16186,8 +16185,10 @@ pub(crate) mod tests {
     /// Test exceeding the accounts data budget by creating accounts in a loop
     #[test]
     fn test_accounts_data_budget_exceeded() {
-        use solana_program_runtime::accounts_data_meter::MAX_ACCOUNTS_DATA_LEN;
-        use solana_sdk::system_instruction::MAX_PERMITTED_DATA_LENGTH;
+        use {
+            solana_program_runtime::accounts_data_meter::MAX_ACCOUNTS_DATA_LEN,
+            solana_sdk::system_instruction::MAX_PERMITTED_DATA_LENGTH,
+        };
 
         solana_logger::setup();
         let (genesis_config, mint_keypair) = create_genesis_config(1_000_000_000_000);

runtime/src/sorted_storages.rs

@@ -3,8 +3,7 @@ use {
     log::*,
     solana_measure::measure::Measure,
     solana_sdk::clock::Slot,
-    std::ops::Range,
-    std::ops::{Bound, RangeBounds},
+    std::ops::{Bound, Range, RangeBounds},
 };
 
 /// Provide access to SnapshotStorages sorted by slot

runtime/src/stake_history.rs

@@ -27,8 +27,7 @@ type StakeHistoryInner = solana_sdk::stake_history::StakeHistory;
 
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use solana_sdk::stake_history::StakeHistoryEntry;
+    use {super::*, solana_sdk::stake_history::StakeHistoryEntry};
 
     fn rand_stake_history_entry() -> StakeHistoryEntry {
         StakeHistoryEntry {

runtime/src/vote_parser.rs

@@ -88,13 +88,17 @@ fn parse_vote_instruction_data(
 
 #[cfg(test)]
 mod test {
-    use solana_sdk::signature::{Keypair, Signer};
-    use solana_vote_program::{
-        vote_instruction, vote_state::Vote, vote_transaction::new_vote_transaction,
+    use {
+        super::*,
+        solana_sdk::{
+            hash::hash,
+            signature::{Keypair, Signer},
+        },
+        solana_vote_program::{
+            vote_instruction, vote_state::Vote, vote_transaction::new_vote_transaction,
+        },
     };
 
-    use {super::*, solana_sdk::hash::hash};
-
     fn run_test_parse_vote_transaction(input_hash: Option<Hash>) {
         let node_keypair = Keypair::new();
         let vote_keypair = Keypair::new();

rustfmt.toml

@@ -0,0 +1,2 @@
+imports_granularity = "One"
+group_imports = "One"

sdk/program/src/example_mocks.rs

@@ -24,10 +24,10 @@ pub mod solana_client {
     }
 
     pub mod rpc_client {
-        use super::super::solana_sdk::{
-            hash::Hash, signature::Signature, transaction::Transaction,
+        use super::{
+            super::solana_sdk::{hash::Hash, signature::Signature, transaction::Transaction},
+            client_error::Result as ClientResult,
         };
-        use super::client_error::Result as ClientResult;
 
         pub struct RpcClient;
 
@@ -63,12 +63,7 @@ pub mod solana_client {
 /// This lets examples in solana-program appear to be written as client
 /// programs.
 pub mod solana_sdk {
-    pub use crate::hash;
-    pub use crate::instruction;
-    pub use crate::message;
-    pub use crate::nonce;
-    pub use crate::pubkey;
-    pub use crate::system_instruction;
+    pub use crate::{hash, instruction, message, nonce, pubkey, system_instruction};
 
     pub mod signature {
         use crate::pubkey::Pubkey;
@@ -103,11 +98,10 @@ pub mod solana_sdk {
     }
 
     pub mod transaction {
-        use super::signers::Signers;
-        use crate::hash::Hash;
-        use crate::instruction::Instruction;
-        use crate::message::Message;
-        use crate::pubkey::Pubkey;
+        use {
+            super::signers::Signers,
+            crate::{hash::Hash, instruction::Instruction, message::Message, pubkey::Pubkey},
+        };
 
         pub struct Transaction {
             pub message: Message,

sdk/program/src/slot_hashes.rs

@@ -2,13 +2,12 @@
 //!
 //! this account carries the Bank's most recent bank hashes for some N parents
 //!
+pub use crate::clock::Slot;
 use {
     crate::hash::Hash,
     std::{iter::FromIterator, ops::Deref},
 };
 
-pub use crate::clock::Slot;
-
 pub const MAX_ENTRIES: usize = 512; // about 2.5 minutes to get your vote in
 
 // This is to allow tests with custom slot hash expiry to avoid having to generate

sdk/src/example_mocks.rs

@@ -24,8 +24,10 @@ pub mod solana_client {
     }
 
     pub mod rpc_client {
-        use super::client_error::Result as ClientResult;
-        use crate::{hash::Hash, signature::Signature, transaction::Transaction};
+        use {
+            super::client_error::Result as ClientResult,
+            crate::{hash::Hash, signature::Signature, transaction::Transaction},
+        };
 
         pub struct RpcClient;
 

sdk/src/transaction_context.rs

@@ -1,15 +1,17 @@
 //! Successors of instruction_context_context::StackFrame, KeyedAccount and AccountInfo
 
-use crate::{
-    account::{AccountSharedData, ReadableAccount, WritableAccount},
-    instruction::InstructionError,
-    lamports::LamportsError,
-    pubkey::Pubkey,
-};
-use std::{
-    cell::{RefCell, RefMut},
-    collections::HashSet,
-    pin::Pin,
+use {
+    crate::{
+        account::{AccountSharedData, ReadableAccount, WritableAccount},
+        instruction::InstructionError,
+        lamports::LamportsError,
+        pubkey::Pubkey,
+    },
+    std::{
+        cell::{RefCell, RefMut},
+        collections::HashSet,
+        pin::Pin,
+    },
 };
 
 pub type TransactionAccount = (Pubkey, AccountSharedData);

sdk/src/wasm/transaction.rs

@@ -2,11 +2,7 @@
 #![cfg(target_arch = "wasm32")]
 #![allow(non_snake_case)]
 use {
-    crate::{
-        hash::Hash,
-        signer::keypair::Keypair,
-        {message::Message, transaction::Transaction},
-    },
+    crate::{hash::Hash, message::Message, signer::keypair::Keypair, transaction::Transaction},
     solana_program::{
         pubkey::Pubkey,
         wasm::{display_to_jsvalue, instructions::Instructions},