Merge branch 'merge-imports'

2 files changed, 9 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..26b2cf7f06 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -1,8 +1,7 @@
 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};
 
 pub struct Status;
 
@@ -29,6 +28,7 @@ impl Command for Status {
             for new_state in rpc.new_state_subscribe()? {
                 print_state(&new_state);
 
+                use self::TunnelStateTransition::*;
                 match new_state {
                     Connected(_) | Disconnected => print_location(&mut rpc)?,
                     _ => {}
@@ -40,6 +40,7 @@ impl Command for Status {
 }
 
 fn print_state(state: &TunnelStateTransition) {
+    use self::TunnelStateTransition::*;
     print!("Tunnel status: ");
     match state {
         Blocked(reason) => print_blocked_reason(reason),