Manually editing full paths to be Rust2018 compatible

15 files changed, 47 insertions, 53 deletions

diff --git a/mullvad-cli/src/cmds/auto_connect.rs b/mullvad-cli/src/cmds/auto_connect.rs
index 3a61107841..41629ad822 100644
--- a/mullvad-cli/src/cmds/auto_connect.rs
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -1,6 +1,5 @@
 use clap::{self, value_t_or_exit};
-use crate::new_rpc_client;
-use crate::{Command, Result};
+use crate::{new_rpc_client, Command, Result};
 
 pub struct AutoConnect;
 
diff --git a/mullvad-cli/src/cmds/connect.rs b/mullvad-cli/src/cmds/connect.rs
index d786aef887..a6fc4b3594 100644
--- a/mullvad-cli/src/cmds/connect.rs
+++ b/mullvad-cli/src/cmds/connect.rs
@@ -1,7 +1,5 @@
 use clap;
-use crate::new_rpc_client;
-use crate::Command;
-use crate::Result;
+use crate::{new_rpc_client, Command, Result};
 use error_chain::ChainedError;
 
 pub struct Connect;
diff --git a/mullvad-cli/src/cmds/disconnect.rs b/mullvad-cli/src/cmds/disconnect.rs
index 1de5b16c34..6bfd3e8ef5 100644
--- a/mullvad-cli/src/cmds/disconnect.rs
+++ b/mullvad-cli/src/cmds/disconnect.rs
@@ -1,7 +1,5 @@
 use clap;
-use crate::new_rpc_client;
-use crate::Command;
-use crate::Result;
+use crate::{new_rpc_client, Command, Result};
 
 
 pub struct Disconnect;
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs
index 330acc63f9..826a494c9d 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -1,7 +1,5 @@
 use clap;
-use crate::new_rpc_client;
-use crate::Command;
-use crate::Result;
+use crate::{new_rpc_client, Command, Result};
 
 use mullvad_ipc_client::DaemonRpcClient;
 use mullvad_types::auth_failed::AuthFailed;
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index c24982db20..f420afdff2 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -41,6 +41,7 @@ mod management_interface;
 mod relays;
 mod rpc_uniqueness_check;
 
+use crate::management_interface::{BoxFuture, ManagementCommand, ManagementInterfaceServer};
 use error_chain::ChainedError;
 use futures::{
     future,
@@ -48,7 +49,6 @@ use futures::{
     Future, Sink,
 };
 use log::{debug, error, info, warn};
-use management_interface::{BoxFuture, ManagementCommand, ManagementInterfaceServer};
 use mullvad_rpc::{AccountsProxy, AppVersionProxy, HttpHandle};
 use mullvad_types::{
     account::{AccountData, AccountToken},
@@ -311,7 +311,7 @@ impl Daemon {
     }
 
     fn handle_event(&mut self, event: DaemonEvent) -> Result<()> {
-        use DaemonEvent::*;
+        use self::DaemonEvent::*;
         match event {
             TunnelStateTransition(transition) => self.handle_tunnel_state_transition(transition),
             GenerateTunnelParameters(tunnel_parameters_tx, retry_attempt) => {
@@ -412,7 +412,7 @@ impl Daemon {
     }
 
     fn handle_management_interface_event(&mut self, event: ManagementCommand) {
-        use ManagementCommand::*;
+        use self::ManagementCommand::*;
         match event {
             SetTargetState(tx, state) => self.on_set_target_state(tx, state),
             GetState(tx) => self.on_get_state(tx),
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 227852e85f..d306e4c33f 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -1,3 +1,4 @@
+use crate::account_history::{AccountHistory, Error as AccountHistoryError};
 use error_chain::ChainedError;
 use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender;
 use jsonrpc_core::futures::{future, sync, Future};
@@ -7,29 +8,26 @@ use jsonrpc_macros::{build_rpc_trait, metadata, pubsub};
 use jsonrpc_pubsub::{PubSubHandler, PubSubMetadata, Session, SubscriptionId};
 use mullvad_paths;
 use mullvad_rpc;
-use mullvad_types::account::{AccountData, AccountToken};
-use mullvad_types::location::GeoIpLocation;
-use mullvad_types::relay_constraints::RelaySettingsUpdate;
-use mullvad_types::relay_list::RelayList;
-use mullvad_types::settings;
-use mullvad_types::settings::Settings;
-use mullvad_types::states::TargetState;
-use mullvad_types::version;
-
+use mullvad_types::{
+    account::{AccountData, AccountToken},
+    location::GeoIpLocation,
+    relay_constraints::RelaySettingsUpdate,
+    relay_list::RelayList,
+    settings::{self, Settings},
+    states::TargetState,
+    version,
+};
 use serde;
-
-use std::collections::hash_map::Entry;
-use std::collections::HashMap;
-use std::path::PathBuf;
-use std::sync::{Arc, Mutex, RwLock};
-
+use std::{
+    collections::{hash_map::Entry, HashMap},
+    path::PathBuf,
+    sync::{Arc, Mutex, RwLock},
+};
 use talpid_core::mpsc::IntoSender;
 use talpid_ipc;
 use talpid_types::{net::OpenVpnProxySettings, tunnel::TunnelStateTransition};
 use uuid;
 
-use account_history::{AccountHistory, Error as AccountHistoryError};
-
 /// FIXME(linus): This is here just because the futures crate has deprecated it and jsonrpc_core
 /// did not introduce their own yet (https://github.com/paritytech/jsonrpc/pull/196).
 /// Remove this and use the one in jsonrpc_core when that is released.
diff --git a/talpid-core/src/security/linux/mod.rs b/talpid-core/src/security/linux/mod.rs
index e57db996e7..2be75ea951 100644
--- a/talpid-core/src/security/linux/mod.rs
+++ b/talpid-core/src/security/linux/mod.rs
@@ -8,12 +8,11 @@ use self::nftnl::{
     nft_expr, nft_expr_bitwise, nft_expr_cmp, nft_expr_ct, nft_expr_meta, nft_expr_payload, Batch,
     Chain, FinalizedBatch, ProtoFamily, Rule, Table,
 };
+use super::{NetworkSecurityT, SecurityPolicy};
+use crate::tunnel;
 use ipnetwork::IpNetwork;
 use lazy_static::lazy_static;
 use libc;
-use talpid_types::net::{Endpoint, TransportProtocol};
-use tunnel;
-
 use std::{
     env,
     ffi::CString,
@@ -21,8 +20,7 @@ use std::{
     net::{IpAddr, Ipv4Addr},
     path::Path,
 };
-
-use super::{NetworkSecurityT, SecurityPolicy};
+use talpid_types::net::{Endpoint, TransportProtocol};
 
 mod dns;
 use self::dns::DnsSettings;
diff --git a/talpid-core/src/security/mod.rs b/talpid-core/src/security/mod.rs
index b6749e432c..7dbb93ad2c 100644
--- a/talpid-core/src/security/mod.rs
+++ b/talpid-core/src/security/mod.rs
@@ -60,7 +60,7 @@ pub enum SecurityPolicy {
         /// The peer endpoint that should be allowed.
         peer_endpoint: Endpoint,
         /// Metadata about the tunnel and tunnel interface.
-        tunnel: ::tunnel::TunnelMetadata,
+        tunnel: crate::tunnel::TunnelMetadata,
         /// Flag setting if communication with LAN networks should be possible.
         allow_lan: bool,
     },
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index 329144b34b..4443898845 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -1,5 +1,4 @@
-use mktemp;
-use process::openvpn::OpenVpnCommand;
+use crate::{mktemp, process::openvpn::OpenVpnCommand};
 
 use std::collections::HashMap;
 use std::ffi::OsString;
diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs
index 15953c580c..ded2e56af5 100644
--- a/talpid-core/src/tunnel/openvpn.rs
+++ b/talpid-core/src/tunnel/openvpn.rs
@@ -1,6 +1,7 @@
-use process::openvpn::{OpenVpnCommand, OpenVpnProcHandle};
-use process::stoppable_process::StoppableProcess;
-
+use crate::process::{
+    openvpn::{OpenVpnCommand, OpenVpnProcHandle},
+    stoppable_process::StoppableProcess,
+};
 use std::collections::HashMap;
 use std::io;
 use std::path::Path;
diff --git a/talpid-core/src/tunnel_state_machine/blocked_state.rs b/talpid-core/src/tunnel_state_machine/blocked_state.rs
index d268ba1e4a..432dea3999 100644
--- a/talpid-core/src/tunnel_state_machine/blocked_state.rs
+++ b/talpid-core/src/tunnel_state_machine/blocked_state.rs
@@ -7,7 +7,7 @@ use super::{
     ConnectingState, DisconnectedState, EventConsequence, ResultExt, SharedTunnelStateValues,
     TunnelCommand, TunnelState, TunnelStateTransition, TunnelStateWrapper,
 };
-use security::SecurityPolicy;
+use crate::security::SecurityPolicy;
 
 /// No tunnel is running and all network connections are blocked.
 pub struct BlockedState;
diff --git a/talpid-core/src/tunnel_state_machine/connected_state.rs b/talpid-core/src/tunnel_state_machine/connected_state.rs
index abb5c3cad5..66f9b78bc1 100644
--- a/talpid-core/src/tunnel_state_machine/connected_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connected_state.rs
@@ -9,8 +9,10 @@ use super::{
     SharedTunnelStateValues, TunnelCommand, TunnelParameters, TunnelState, TunnelStateTransition,
     TunnelStateWrapper,
 };
-use security::SecurityPolicy;
-use tunnel::{CloseHandle, TunnelEvent, TunnelMetadata};
+use crate::{
+    security::SecurityPolicy,
+    tunnel::{CloseHandle, TunnelEvent, TunnelMetadata},
+};
 
 pub struct ConnectedStateBootstrap {
     pub metadata: TunnelMetadata,
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index 873eaa9933..f34c0e6667 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -17,9 +17,12 @@ use super::{
     EventConsequence, SharedTunnelStateValues, TunnelCommand, TunnelParameters, TunnelState,
     TunnelStateTransition, TunnelStateWrapper,
 };
-use logging;
-use security::SecurityPolicy;
-use tunnel::{self, CloseHandle, TunnelEvent, TunnelMetadata, TunnelMonitor};
+use crate::{
+    logging,
+    security::SecurityPolicy,
+    tunnel::{self, CloseHandle, TunnelEvent, TunnelMetadata, TunnelMonitor},
+};
+
 
 const MIN_TUNNEL_ALIVE_TIME: Duration = Duration::from_millis(1000);
 
diff --git a/talpid-core/src/tunnel_state_machine/disconnecting_state.rs b/talpid-core/src/tunnel_state_machine/disconnecting_state.rs
index 2e09aab322..339c6e3aa3 100644
--- a/talpid-core/src/tunnel_state_machine/disconnecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/disconnecting_state.rs
@@ -9,7 +9,7 @@ use super::{
     BlockedState, ConnectingState, DisconnectedState, EventConsequence, ResultExt,
     SharedTunnelStateValues, TunnelCommand, TunnelState, TunnelStateTransition, TunnelStateWrapper,
 };
-use tunnel::CloseHandle;
+use crate::tunnel::CloseHandle;
 
 /// This state is active from when we manually trigger a tunnel kill until the tunnel wait
 /// operation (TunnelExit) returned.
diff --git a/talpid-core/src/tunnel_state_machine/macros.rs b/talpid-core/src/tunnel_state_machine/macros.rs
index 2241c8cb06..9c667e579f 100644
--- a/talpid-core/src/tunnel_state_machine/macros.rs
+++ b/talpid-core/src/tunnel_state_machine/macros.rs
@@ -10,10 +10,10 @@
 macro_rules! try_handle_event {
     ($same_state:expr, $event:expr) => {
         match $event {
-            Ok(::futures::Async::Ready(Some(event))) => Ok(event),
-            Ok(::futures::Async::Ready(None)) => Err(None),
-            Ok(::futures::Async::NotReady) => {
-                return ::tunnel_state_machine::EventConsequence::NoEvents($same_state);
+            Ok(crate::futures::Async::Ready(Some(event))) => Ok(event),
+            Ok(crate::futures::Async::Ready(None)) => Err(None),
+            Ok(crate::futures::Async::NotReady) => {
+                return crate::tunnel_state_machine::EventConsequence::NoEvents($same_state);
             }
             Err(error) => Err(Some(error)),
         }