summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-12-13 17:32:24 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-12-13 17:36:07 +0100
commitffd272313cdfc77a79876050170272ab36fe932d (patch)
tree4036176402e0f1d306d57a2860074699cbf4f319 /mullvad-cli/src
parente175aaa139da8010fd3ae85bfc10dc7d98d50acc (diff)
downloadmullvadvpn-ffd272313cdfc77a79876050170272ab36fe932d.tar.xz
mullvadvpn-ffd272313cdfc77a79876050170272ab36fe932d.zip
Activate the merge_imports rustfmt feature
Diffstat (limited to 'mullvad-cli/src')
-rw-r--r--mullvad-cli/src/cmds/relay.rs10
-rw-r--r--mullvad-cli/src/cmds/status.rs6
2 files changed, 10 insertions, 6 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index 058c17976a..edabbe8b9b 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -2,11 +2,13 @@ use crate::{new_rpc_client, Command, Result, ResultExt};
use clap::value_t;
use std::str::FromStr;
-use mullvad_types::relay_constraints::{
- Constraint, LocationConstraint, OpenVpnConstraints, RelayConstraintsUpdate,
- RelaySettingsUpdate, TunnelConstraints,
+use mullvad_types::{
+ relay_constraints::{
+ Constraint, LocationConstraint, OpenVpnConstraints, RelayConstraintsUpdate,
+ RelaySettingsUpdate, TunnelConstraints,
+ },
+ CustomTunnelEndpoint,
};
-use mullvad_types::CustomTunnelEndpoint;
use talpid_types::net::{
OpenVpnEndpointData, TransportProtocol, TunnelEndpointData, WireguardEndpointData,
};
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs
index 11b0156edf..46a2968d72 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -1,8 +1,10 @@
use crate::{new_rpc_client, Command, Result};
use mullvad_ipc_client::DaemonRpcClient;
use mullvad_types::auth_failed::AuthFailed;
-use talpid_types::tunnel::BlockReason;
-use talpid_types::tunnel::TunnelStateTransition::{self, *};
+use talpid_types::tunnel::{
+ BlockReason,
+ TunnelStateTransition::{self, *},
+};
pub struct Status;