summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-04-10 15:41:19 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-04-10 16:20:26 +0200
commitb8640c21cfcdf20b3234735f916fe87b3b984fa5 (patch)
treeb436acd8af1a3905bba4bf94e94111c8e8ad1bce /mullvad-cli/src
parent07042d4770adb4be2b21f275a19703a7bd01d535 (diff)
downloadmullvadvpn-b8640c21cfcdf20b3234735f916fe87b3b984fa5.tar.xz
mullvadvpn-b8640c21cfcdf20b3234735f916fe87b3b984fa5.zip
Format with rustfmt 0.4.1-nightly (e784712 2018-04-09)
Diffstat (limited to 'mullvad-cli/src')
-rw-r--r--mullvad-cli/src/cmds/connect.rs4
-rw-r--r--mullvad-cli/src/cmds/disconnect.rs4
-rw-r--r--mullvad-cli/src/cmds/mod.rs2
-rw-r--r--mullvad-cli/src/cmds/relay.rs2
-rw-r--r--mullvad-cli/src/cmds/status.rs2
5 files changed, 7 insertions, 7 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};