Optimize imports in source files.

durio/src/main.rs

@@ -3,11 +3,12 @@ use std::net::SocketAddr;
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
-use kvraft::KVServer;
 use lazy_static::lazy_static;
 use serde_derive::{Deserialize, Serialize};
 use warp::Filter;
 
+use kvraft::KVServer;
+
 use crate::kv_service::create_async_clerk;
 use crate::run::run_kv_instance;
 

kvraft/src/server.rs

@@ -9,7 +9,6 @@ use futures::FutureExt;
 use parking_lot::Mutex;
 use serde_derive::{Deserialize, Serialize};
 
-use crate::{CommitSentinelArgs, CommitSentinelReply};
 use ruaft::{
     ApplyCommandMessage, Index, Persister, Raft, RemoteRaft, Term,
     VerifyAuthorityResult,
@@ -18,8 +17,8 @@ use test_utils::log_with;
 use test_utils::thread_local_logger::LocalLogger;
 
 use crate::common::{
-    ClerkId, GetArgs, GetReply, KVError, PutAppendArgs, PutAppendEnum,
-    PutAppendReply, UniqueId,
+    ClerkId, CommitSentinelArgs, CommitSentinelReply, GetArgs, GetReply,
+    KVError, PutAppendArgs, PutAppendEnum, PutAppendReply, UniqueId,
 };
 use crate::snapshot_holder::SnapshotHolder;
 

src/daemon_env.rs

@@ -3,11 +3,12 @@ use std::sync::{Arc, Weak};
 
 use parking_lot::Mutex;
 
-use crate::index_term::IndexTerm;
-use crate::{Peer, RaftState, State, Term};
 #[cfg(all(not(test), feature = "integration-test"))]
 use test_utils::thread_local_logger::{self, LocalLogger};
 
+use crate::index_term::IndexTerm;
+use crate::{Peer, RaftState, State, Term};
+
 /// A convenient macro to record errors.
 #[macro_export]
 macro_rules! check_or_record {

src/term_marker.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
 use parking_lot::Mutex;
+use serde::Serialize;
 
 use crate::election::ElectionState;
 use crate::{Persister, Raft, RaftState, State, Term};
-use serde::Serialize;
 
 /// A closure that updates the `Term` of the `RaftState`.
 #[derive(Clone)]

src/verify_authority.rs

@@ -1,13 +1,15 @@
-use crate::beat_ticker::{Beat, SharedBeatTicker};
-use crate::daemon_env::Daemon;
-use crate::{Index, Raft, Term, HEARTBEAT_INTERVAL_MILLIS};
-use parking_lot::{Condvar, Mutex};
 use std::collections::VecDeque;
 use std::future::Future;
 use std::sync::atomic::Ordering;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
+use parking_lot::{Condvar, Mutex};
+
+use crate::beat_ticker::{Beat, SharedBeatTicker};
+use crate::daemon_env::Daemon;
+use crate::{Index, Raft, Term, HEARTBEAT_INTERVAL_MILLIS};
+
 /// The result returned to a verify authority request.
 /// This request is not directly exposed to end users. Instead it is used
 /// internally to implement no-commit read-only requests.