Reorder imports

Author: Seulgi Kim

client/src/client.rs

@@ -1,18 +1,16 @@
-use std::cell::Cell;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::thread;
-use std::time::Duration;
-
-use ws::connect;
-
 use super::handler::WebSocketHandler;
 use super::hardware_usage::HardwareService;
 use super::logger::init as logger_init;
 use super::process::{self, ProcessOption};
 use super::rpc::api::add_routing;
 use super::rpc::router::Router;
 use super::types::{ClientArgs, HandlerContext};
+use std::cell::Cell;
+use std::rc::Rc;
+use std::sync::Arc;
+use std::thread;
+use std::time::Duration;
+use ws::connect;
 
 pub fn run(args: &ClientArgs) {
     logger_init().expect("Logger should be initialized");

client/src/handler.rs

@@ -1,16 +1,14 @@
-use std::cell::Cell;
-use std::rc::Rc;
-use std::sync::Arc;
-
+use super::rpc::router::{Error as RouterError, Router};
+use super::types::HandlerContext;
 use jsonrpc_core::types::{
     Call, Error as JSONRPCError, ErrorCode, Failure, Id, MethodCall, Response, Success, Version,
 };
 use serde_json;
+use std::cell::Cell;
+use std::rc::Rc;
+use std::sync::Arc;
 use ws::{CloseCode, Error as WSError, Handler, Handshake, Message, Result, Sender};
 
-use super::rpc::router::{Error as RouterError, Router};
-use super::types::HandlerContext;
-
 pub struct WebSocketHandler {
     pub out: Sender,
     pub count: Rc<Cell<u32>>,

client/src/hardware_usage.rs

@@ -1,16 +1,13 @@
-use std::error::Error;
-use std::sync::Arc;
-use std::thread;
-use std::time::Duration;
-
 use crossbeam::channel::{Receiver, Sender};
 use crossbeam::{channel, select};
 use parking_lot::Mutex;
 use serde_derive::Serialize;
-use sysinfo;
-use sysinfo::{DiskExt, SystemExt};
-use systemstat;
-use systemstat::{CPULoad, DelayedMeasurement, Platform};
+use std::error::Error;
+use std::sync::Arc;
+use std::thread;
+use std::time::Duration;
+use sysinfo::{self, DiskExt, SystemExt};
+use systemstat::{self, CPULoad, DelayedMeasurement, Platform};
 
 /**
  * We use both sysinfo and systemstat

client/src/logger/logger.rs

@@ -1,12 +1,9 @@
-use std::env;
-use std::thread;
-
 use atty;
 use colored::Colorize;
 use env_logger::filter::{Builder as FilterBuilder, Filter};
-use time;
-
 use log::{LevelFilter, Log, Metadata, Record};
+use std::{env, thread};
+use time;
 
 pub struct Logger {
     filter: Filter,

client/src/logger/mod.rs

@@ -3,9 +3,8 @@ mod logger;
 #[macro_use]
 pub mod macros;
 
-pub use log::Level;
-
 use self::logger::Logger;
+pub use log::Level;
 use log::SetLoggerError;
 
 pub fn init() -> Result<(), SetLoggerError> {

client/src/process/binary_update.rs

@@ -1,10 +1,7 @@
-use std::thread;
-
-use crossbeam;
-
-use super::fs_util;
 use super::update::{CallbackResult, Sender};
-use super::Error;
+use super::{fs_util, Error};
+use crossbeam;
+use std::thread;
 
 pub struct Job {}
 

client/src/process/codechain_process.rs

@@ -1,16 +1,14 @@
+use super::ProcessOption;
+use parking_lot::Mutex;
+use reopen::Reopen;
 use std::fs::OpenOptions;
 use std::io::{self, Read, Write};
 use std::path::Path;
 use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
-
-use parking_lot::Mutex;
-use reopen::Reopen;
 use subprocess::{Exec, ExitStatus, Popen, PopenError, Redirection};
 
-use super::ProcessOption;
-
 #[derive(Clone)]
 pub struct CodeChainProcess {
     process: Arc<Mutex<Popen>>,

client/src/process/fs_util.rs

@@ -1,9 +1,7 @@
+use super::Error;
 use std::path::Path;
-
 use subprocess::Exec;
 
-use super::Error;
-
 pub fn move_file(dir: &str, from: &str, to: &str) -> Result<(), Error> {
     cdebug!(PROCESS, "Move {} to {}", from, to);
     let exec = Exec::cmd("mv").arg(from).arg(to).cwd(dir).capture()?;

client/src/process/git_update.rs

@@ -1,11 +1,8 @@
-use std::thread;
-
-use crossbeam;
-
 use super::super::types::CommitHash;
-use super::git_util;
 use super::update::{CallbackResult, Sender};
-use super::Error;
+use super::{git_util, Error};
+use crossbeam;
+use std::thread;
 
 pub struct Job {}
 

client/src/process/git_util.rs

@@ -1,6 +1,5 @@
 use super::super::types::CommitHash;
-use super::Error;
-use super::Exec;
+use super::{Error, Exec};
 
 pub fn current_hash(codechain_dir: String) -> Result<CommitHash, Error> {
     cdebug!(PROCESS, "Run git rev-parse HEAD at {}", codechain_dir);