Format with rustfmt 0.4.1-nightly (e784712 2018-04-09)

10 files changed, 12 insertions, 12 deletions

diff --git a/mullvad-cli/src/cmds/connect.rs b/mullvad-cli/src/cmds/connect.rs
index 4847a0805a..282af42294 100644
--- a/mullvad-cli/src/cmds/connect.rs
+++ b/mullvad-cli/src/cmds/connect.rs
@@ -1,7 +1,7 @@
-use Command;
-use Result;
 use clap;
 use rpc;
+use Command;
+use Result;
 
 pub struct Connect;
 
diff --git a/mullvad-cli/src/cmds/disconnect.rs b/mullvad-cli/src/cmds/disconnect.rs
index 543aa9d0cc..a7900b0dd6 100644
--- a/mullvad-cli/src/cmds/disconnect.rs
+++ b/mullvad-cli/src/cmds/disconnect.rs
@@ -1,7 +1,7 @@
-use Command;
-use Result;
 use clap;
 use rpc;
+use Command;
+use Result;
 
 pub struct Disconnect;
 
diff --git a/mullvad-cli/src/cmds/mod.rs b/mullvad-cli/src/cmds/mod.rs
index 6de212b7fb..3b6e26a2a8 100644
--- a/mullvad-cli/src/cmds/mod.rs
+++ b/mullvad-cli/src/cmds/mod.rs
@@ -1,5 +1,5 @@
-use Command;
 use std::collections::HashMap;
+use Command;
 
 mod account;
 pub use self::account::Account;
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 913b3b3a33..d149c9ec75 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -2,11 +2,11 @@ use clap;
 use std::str::FromStr;
 use {Command, Result, ResultExt};
 
-use mullvad_types::CustomTunnelEndpoint;
 use mullvad_types::relay_constraints::{Constraint, LocationConstraint, OpenVpnConstraints,
                                        RelayConstraintsUpdate, RelaySettings, RelaySettingsUpdate,
                                        TunnelConstraints};
 use mullvad_types::relay_list::RelayList;
+use mullvad_types::CustomTunnelEndpoint;
 
 use rpc;
 use talpid_types::net::{OpenVpnEndpointData, TransportProtocol, TunnelEndpointData,
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs
index b904f4df4a..175e6638b0 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -1,6 +1,6 @@
+use clap;
 use Command;
 use Result;
-use clap;
 
 use mullvad_types::location::GeoIpLocation;
 use mullvad_types::states::{DaemonState, SecurityState, TargetState};
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 01f7e60488..ef86bcef0a 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -18,8 +18,8 @@ use mullvad_types::version;
 
 use serde;
 
-use std::collections::HashMap;
 use std::collections::hash_map::Entry;
+use std::collections::HashMap;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, Mutex, RwLock};
 use talpid_core::mpsc::IntoSender;
diff --git a/mullvad-rpc/src/lib.rs b/mullvad-rpc/src/lib.rs
index 38327aa148..595ba5697f 100644
--- a/mullvad-rpc/src/lib.rs
+++ b/mullvad-rpc/src/lib.rs
@@ -23,8 +23,8 @@ extern crate tokio_core;
 
 extern crate mullvad_types;
 
-use chrono::DateTime;
 use chrono::offset::Utc;
+use chrono::DateTime;
 use jsonrpc_client_http::HttpTransport;
 use tokio_core::reactor::Handle;
 
diff --git a/mullvad-types/src/account.rs b/mullvad-types/src/account.rs
index 5b335514f1..631c5fbdc8 100644
--- a/mullvad-types/src/account.rs
+++ b/mullvad-types/src/account.rs
@@ -1,5 +1,5 @@
-use chrono::DateTime;
 use chrono::offset::Utc;
+use chrono::DateTime;
 
 pub type AccountToken = String;
 
diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs
index baeb06302e..f2369ce7fa 100644
--- a/mullvad-types/src/relay_constraints.rs
+++ b/mullvad-types/src/relay_constraints.rs
@@ -1,5 +1,5 @@
-use CustomTunnelEndpoint;
 use location::{CityCode, CountryCode};
+use CustomTunnelEndpoint;
 
 use std::fmt;
 
diff --git a/talpid-core/src/firewall/macos/dns.rs b/talpid-core/src/firewall/macos/dns.rs
index c9b7f415f3..4ff86dd948 100644
--- a/talpid-core/src/firewall/macos/dns.rs
+++ b/talpid-core/src/firewall/macos/dns.rs
@@ -5,7 +5,7 @@ use self::core_foundation::array::CFArray;
 use self::core_foundation::base::{CFType, TCFType};
 use self::core_foundation::dictionary::CFDictionary;
 use self::core_foundation::propertylist::CFPropertyList;
-use self::core_foundation::runloop::{CFRunLoop, kCFRunLoopCommonModes};
+use self::core_foundation::runloop::{kCFRunLoopCommonModes, CFRunLoop};
 use self::core_foundation::string::CFString;
 
 use self::system_configuration::dynamic_store::{SCDynamicStore, SCDynamicStoreBuilder,