Optimize imports in tests.

kvraft/tests/service_test.rs

@@ -2,6 +2,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
 use scopeguard::defer;
+
 use test_configs::kvraft::config::make_config;
 use test_configs::kvraft::generic_test::{
     generic_test, spawn_clients, GenericTestParams,

test_configs/src/kvraft/config.rs

@@ -5,11 +5,11 @@ use parking_lot::Mutex;
 use rand::seq::SliceRandom;
 use rand::thread_rng;
 
-use crate::{register_kv_server, register_server, Persister, RpcClient};
-
 use kvraft::Clerk;
 use kvraft::KVServer;
 
+use crate::{register_kv_server, register_server, Persister, RpcClient};
+
 struct ConfigState {
     kv_servers: Vec<Option<Arc<KVServer>>>,
     next_clerk: usize,

test_configs/src/kvraft/generic_test.rs

@@ -5,15 +5,16 @@ use std::time::{Duration, Instant};
 
 use parking_lot::Mutex;
 use rand::{thread_rng, Rng};
-use test_utils::thread_local_logger::LocalLogger;
 
+use kvraft::Clerk;
 use linearizability::{KvInput, KvModel, KvOp, KvOutput, Operation};
+use test_utils::thread_local_logger::LocalLogger;
 
-use super::config::{make_config, Config};
 use crate::utils::{
     sleep_election_timeouts, sleep_millis, LONG_ELECTION_TIMEOUT_MILLIS,
 };
-use kvraft::Clerk;
+
+use super::config::{make_config, Config};
 
 pub fn spawn_clients<T, Func>(
     config: Arc<Config>,

test_configs/src/raft/config.rs

@@ -8,9 +8,10 @@ use anyhow::{anyhow, bail};
 use parking_lot::Mutex;
 use rand::{thread_rng, Rng};
 
+use ruaft::{ApplyCommandMessage, Persister, Raft, Term};
+
 use crate::register_server;
 use crate::utils::{sleep_millis, NO_SNAPSHOT};
-use ruaft::{ApplyCommandMessage, Persister, Raft, Term};
 
 struct ConfigState {
     rafts: Vec<Option<Raft<i32>>>,

test_configs/src/rpcs.rs

@@ -1,13 +1,13 @@
 use std::future::Future;
 
 use async_trait::async_trait;
+use futures_util::future::BoxFuture;
+use futures_util::FutureExt;
 use labrpc::{Client, Network, ReplyMessage, RequestMessage, Server};
 use parking_lot::Mutex;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 
-use futures_util::future::BoxFuture;
-use futures_util::FutureExt;
 use kvraft::{
     CommitSentinelArgs, CommitSentinelReply, GetArgs, GetReply, KVServer,
     PutAppendArgs, PutAppendReply, RemoteKvraft,
@@ -232,13 +232,13 @@ mod tests {
 
     use bytes::Bytes;
 
-    use ruaft::{ApplyCommandMessage, RemoteRaft, Term};
-
-    use super::*;
     use ruaft::utils::integration_test::{
         make_append_entries_args, make_request_vote_args,
         unpack_append_entries_reply, unpack_request_vote_reply,
     };
+    use ruaft::{ApplyCommandMessage, RemoteRaft, Term};
+
+    use super::*;
 
     struct DoNothingPersister;
     impl ruaft::Persister for DoNothingPersister {

test_utils/src/thread_local_logger.rs

@@ -24,11 +24,11 @@
 /// logger to all sub-threads. Unfortunately we do not have access to methods
 /// like `std::thread::spawn()`, thus the copying can only be done manually.
 use std::cell::RefCell;
+use std::fmt::Formatter;
+use std::ops::Deref;
 use std::sync::{Arc, Once};
 
 use log::{Log, Metadata, Record};
-use std::fmt::Formatter;
-use std::ops::Deref;
 
 struct GlobalLogger;
 #[cfg(not(feature = "must-log"))]

tests/agreement_tests.rs

@@ -1,6 +1,8 @@
 #![allow(clippy::identity_op)]
+
 use rand::{thread_rng, Rng};
 use scopeguard::defer;
+
 use test_configs::utils::{sleep_election_timeouts, sleep_millis};
 use test_configs::{make_config, raft::config};
 

tests/election_tests.rs

@@ -1,4 +1,5 @@
 use scopeguard::defer;
+
 use test_configs::utils::{sleep_election_timeouts, sleep_millis};
 use test_configs::{make_config, raft::config};
 

tests/persist_tests.rs

@@ -6,6 +6,7 @@ use std::sync::Arc;
 
 use rand::{thread_rng, Rng};
 use scopeguard::defer;
+
 use test_configs::utils::{
     sleep_election_timeouts, sleep_millis, LONG_ELECTION_TIMEOUT_MILLIS,
 };