run rust fmt on master

rustfmt 0.4.1-stable (7a80726 2018-04-20)

Signed-off-by: Andreea Florescu <[email protected]>

Author: andreeaflorescu

api_server/src/http_service.rs

@@ -5,17 +5,17 @@ use std::str;
 use std::sync::mpsc;
 use std::sync::{Arc, RwLock};
 
-use futures::{Future, Stream};
 use futures::future::{self, Either};
+use futures::{Future, Stream};
 
 use hyper::{self, Chunk, Headers, Method, StatusCode};
 use serde_json;
 use tokio_core::reactor::Handle;
 
+use super::{ActionMap, ActionMapValue};
 use data_model::vm::MachineConfiguration;
-use request::{self, ApiRequest, AsyncOutcome, AsyncRequestBody, IntoParsedRequest, ParsedRequest};
 use request::instance_info::InstanceInfo;
-use super::{ActionMap, ActionMapValue};
+use request::{self, ApiRequest, AsyncOutcome, AsyncRequestBody, IntoParsedRequest, ParsedRequest};
 use sys_util::EventFd;
 
 fn build_response_base<B: Into<hyper::Body>>(
@@ -500,11 +500,11 @@ impl hyper::server::Service for ApiServerHttpService {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use hyper::header::{ContentType, Headers};
-    use hyper::Body;
+    use fc_util::LriHashMap;
     use futures::sync::oneshot;
+    use hyper::Body;
+    use hyper::header::{ContentType, Headers};
     use net_util::MacAddr;
-    use fc_util::LriHashMap;
     use request::async::AsyncRequest;
     use request::sync::{DeviceState, DriveDescription, DrivePermissions, NetworkInterfaceBody,
                         SyncRequest};

api_server/src/lib.rs

@@ -17,10 +17,10 @@ pub mod request;
 
 use std::cell::RefCell;
 use std::io;
+use std::path::Path;
 use std::rc::Rc;
-use std::sync::{Arc, RwLock};
 use std::sync::mpsc;
-use std::path::Path;
+use std::sync::{Arc, RwLock};
 
 use futures::{Future, Stream};
 use hyper::server::Http;

api_server/src/request/mod.rs

@@ -3,11 +3,11 @@ pub mod sync;
 
 use std::result;
 
-use hyper::Method;
 pub use self::async::{AsyncOutcome, AsyncOutcomeReceiver, AsyncOutcomeSender, AsyncRequest,
                       AsyncRequestBody};
 pub use self::sync::{APILoggerDescription, BootSourceBody, DriveDescription, NetworkInterfaceBody,
                      SyncOutcomeReceiver, SyncOutcomeSender, SyncRequest};
+use hyper::Method;
 
 pub mod instance_info;
 

api_server/src/request/sync/boot_source.rs

@@ -4,8 +4,8 @@ use futures::sync::oneshot;
 use hyper::{Response, StatusCode};
 
 use http_service::{empty_response, json_fault_message, json_response};
-use request::{ParsedRequest, SyncRequest};
 use request::sync::GenerateResponse;
+use request::{ParsedRequest, SyncRequest};
 
 #[derive(Debug, Deserialize, PartialEq, Serialize)]
 pub enum BootSourceType {

api_server/src/request/sync/drive.rs

@@ -3,9 +3,9 @@ use std::result;
 use futures::sync::oneshot;
 use hyper::{Response, StatusCode};
 
-use request::ParsedRequest;
-use http_service::{empty_response, json_fault_message, json_response};
 use super::{DeviceState, GenerateResponse, SyncRequest};
+use http_service::{empty_response, json_fault_message, json_response};
+use request::ParsedRequest;
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 #[allow(non_camel_case_types)]

api_server/src/request/sync/logger.rs

@@ -4,8 +4,8 @@ use futures::sync::oneshot;
 use hyper::{Response, StatusCode};
 
 use http_service::{empty_response, json_fault_message, json_response};
-use request::{ParsedRequest, SyncRequest};
 use request::sync::GenerateResponse;
+use request::{ParsedRequest, SyncRequest};
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub enum APILoggerLevel {

api_server/src/request/sync/machine_configuration.rs

@@ -5,8 +5,8 @@ use hyper::{Method, Response, StatusCode};
 
 use data_model::vm::MachineConfiguration;
 use http_service::{empty_response, json_fault_message, json_response};
-use request::{IntoParsedRequest, ParsedRequest, SyncRequest};
 use request::sync::GenerateResponse;
+use request::{IntoParsedRequest, ParsedRequest, SyncRequest};
 
 #[derive(Debug)]
 pub enum PutMachineConfigurationError {

api_server/src/request/sync/mod.rs

@@ -14,8 +14,8 @@ mod logger;
 pub mod machine_configuration;
 mod net;
 
-pub use self::drive::{DriveDescription, DriveError, DrivePermissions, PutDriveOutcome};
 pub use self::boot_source::{BootSourceBody, BootSourceType, LocalImage};
+pub use self::drive::{DriveDescription, DriveError, DrivePermissions, PutDriveOutcome};
 pub use self::logger::{APILoggerDescription, APILoggerError, APILoggerLevel, PutLoggerOutcome};
 pub use self::net::NetworkInterfaceBody;
 

api_server/src/request/sync/net.rs

@@ -6,8 +6,8 @@ use request::ParsedRequest;
 use serde::de::{self, Deserialize, Deserializer};
 use serde::ser::{Serialize, Serializer};
 
-use net_util::MacAddr;
 use super::{DeviceState, SyncRequest};
+use net_util::MacAddr;
 
 // used to serialize an Option<MacAddr>
 fn mac_serialize_with<S>(what: &Option<MacAddr>, serializer: S) -> result::Result<S::Ok, S::Error>

devices/src/legacy/serial.rs

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-use std::io;
 use std::collections::VecDeque;
+use std::io;
 
 use sys_util::{EventFd, Result};
 
@@ -231,8 +231,8 @@ impl BusDevice for Serial {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::sync::{Arc, Mutex};
     use std::io;
+    use std::sync::{Arc, Mutex};
 
     #[derive(Clone)]
     struct SharedBuffer {