Update paths to start with crate:: etc

25 files changed, 53 insertions, 53 deletions

diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index 24b86817dd..1dfff05f6c 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -1,5 +1,5 @@
 use clap::{self, value_t_or_exit};
-use {new_rpc_client, Command, Result};
+use crate::{new_rpc_client, Command, Result};
 
 use mullvad_types::account::AccountToken;
 
diff --git a/mullvad-cli/src/cmds/auto_connect.rs b/mullvad-cli/src/cmds/auto_connect.rs
index bde829694e..3a61107841 100644
--- a/mullvad-cli/src/cmds/auto_connect.rs
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -1,6 +1,6 @@
 use clap::{self, value_t_or_exit};
-use new_rpc_client;
-use {Command, Result};
+use crate::new_rpc_client;
+use crate::{Command, Result};
 
 pub struct AutoConnect;
 
diff --git a/mullvad-cli/src/cmds/connect.rs b/mullvad-cli/src/cmds/connect.rs
index 40dbe5a5a0..d786aef887 100644
--- a/mullvad-cli/src/cmds/connect.rs
+++ b/mullvad-cli/src/cmds/connect.rs
@@ -1,8 +1,8 @@
 use clap;
+use crate::new_rpc_client;
+use crate::Command;
+use crate::Result;
 use error_chain::ChainedError;
-use new_rpc_client;
-use Command;
-use Result;
 
 pub struct Connect;
 
diff --git a/mullvad-cli/src/cmds/disconnect.rs b/mullvad-cli/src/cmds/disconnect.rs
index 99009d705f..1de5b16c34 100644
--- a/mullvad-cli/src/cmds/disconnect.rs
+++ b/mullvad-cli/src/cmds/disconnect.rs
@@ -1,7 +1,7 @@
 use clap;
-use new_rpc_client;
-use Command;
-use Result;
+use crate::new_rpc_client;
+use crate::Command;
+use crate::Result;
 
 
 pub struct Disconnect;
diff --git a/mullvad-cli/src/cmds/lan.rs b/mullvad-cli/src/cmds/lan.rs
index dffcc70a2e..000f05f3fe 100644
--- a/mullvad-cli/src/cmds/lan.rs
+++ b/mullvad-cli/src/cmds/lan.rs
@@ -1,5 +1,5 @@
 use clap::{self, value_t_or_exit};
-use {new_rpc_client, Command, Result};
+use crate::{new_rpc_client, Command, Result};
 
 pub struct Lan;
 
diff --git a/mullvad-cli/src/cmds/mod.rs b/mullvad-cli/src/cmds/mod.rs
index 02e5663d2f..e80ef875a5 100644
--- a/mullvad-cli/src/cmds/mod.rs
+++ b/mullvad-cli/src/cmds/mod.rs
@@ -1,5 +1,5 @@
+use crate::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 9f12f8af33..538217df6b 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -1,6 +1,6 @@
 use clap::{self, value_t};
+use crate::{new_rpc_client, Command, Result, ResultExt};
 use std::str::FromStr;
-use {new_rpc_client, Command, Result, ResultExt};
 
 use mullvad_types::relay_constraints::{
     Constraint, LocationConstraint, OpenVpnConstraints, RelayConstraintsUpdate,
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs
index b1a05bfd07..330acc63f9 100644
--- a/mullvad-cli/src/cmds/status.rs
+++ b/mullvad-cli/src/cmds/status.rs
@@ -1,7 +1,7 @@
 use clap;
-use new_rpc_client;
-use Command;
-use Result;
+use crate::new_rpc_client;
+use crate::Command;
+use crate::Result;
 
 use mullvad_ipc_client::DaemonRpcClient;
 use mullvad_types::auth_failed::AuthFailed;
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 329f72f6bd..3c77ed986c 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -1,5 +1,5 @@
 use clap::{self, value_t};
-use {new_rpc_client, Command, Result};
+use crate::{new_rpc_client, Command, Result};
 
 use talpid_types::net::{
     LocalOpenVpnProxySettings, OpenVpnProxyAuth, OpenVpnProxySettings,
diff --git a/mullvad-cli/src/cmds/version.rs b/mullvad-cli/src/cmds/version.rs
index 2277e57d68..e88468b9a7 100644
--- a/mullvad-cli/src/cmds/version.rs
+++ b/mullvad-cli/src/cmds/version.rs
@@ -1,5 +1,5 @@
 use clap;
-use {new_rpc_client, Command, Result};
+use crate::{new_rpc_client, Command, Result};
 
 pub struct Version;
 
diff --git a/mullvad-daemon/src/cli.rs b/mullvad-daemon/src/cli.rs
index 017a15a3e9..9df4ceb509 100644
--- a/mullvad-daemon/src/cli.rs
+++ b/mullvad-daemon/src/cli.rs
@@ -1,7 +1,7 @@
 use clap::{crate_authors, crate_description, crate_name, App, Arg};
 use log;
 
-use version;
+use crate::version;
 
 pub struct Config {
     pub log_level: log::LevelFilter,
diff --git a/mullvad-paths/src/cache.rs b/mullvad-paths/src/cache.rs
index 133d08df86..dcf799eeb9 100644
--- a/mullvad-paths/src/cache.rs
+++ b/mullvad-paths/src/cache.rs
@@ -1,4 +1,4 @@
-use Result;
+use crate::Result;
 
 use std::env;
 use std::path::PathBuf;
@@ -6,13 +6,13 @@ use std::path::PathBuf;
 /// Creates and returns the cache directory pointed to by `MULLVAD_CACHE_DIR`, or the default
 /// one if that variable is unset.
 pub fn cache_dir() -> Result<PathBuf> {
-    ::create_and_return(get_cache_dir)
+    crate::create_and_return(get_cache_dir)
 }
 
 fn get_cache_dir() -> Result<PathBuf> {
     match env::var_os("MULLVAD_CACHE_DIR") {
         Some(path) => Ok(PathBuf::from(path)),
-        None => get_default_cache_dir().map(|dir| dir.join(::PRODUCT_NAME)),
+        None => get_default_cache_dir().map(|dir| dir.join(crate::PRODUCT_NAME)),
     }
 }
 
diff --git a/mullvad-paths/src/lib.rs b/mullvad-paths/src/lib.rs
index 9e20700cb7..4c0c55eb2a 100644
--- a/mullvad-paths/src/lib.rs
+++ b/mullvad-paths/src/lib.rs
@@ -42,16 +42,16 @@ fn create_and_return(dir_fn: fn() -> Result<PathBuf>) -> Result<PathBuf> {
 }
 
 mod cache;
-pub use cache::cache_dir;
+pub use crate::cache::cache_dir;
 
 mod logs;
-pub use logs::{get_log_dir, log_dir};
+pub use crate::logs::{get_log_dir, log_dir};
 
 pub mod resources;
-pub use resources::get_resource_dir;
+pub use crate::resources::get_resource_dir;
 
 mod rpc_socket;
-pub use rpc_socket::get_rpc_socket_path;
+pub use crate::rpc_socket::get_rpc_socket_path;
 
 mod settings;
-pub use settings::settings_dir;
+pub use crate::settings::settings_dir;
diff --git a/mullvad-paths/src/logs.rs b/mullvad-paths/src/logs.rs
index fe717b71c0..70004342c1 100644
--- a/mullvad-paths/src/logs.rs
+++ b/mullvad-paths/src/logs.rs
@@ -1,4 +1,4 @@
-use Result;
+use crate::Result;
 
 use std::env;
 use std::path::PathBuf;
@@ -6,14 +6,14 @@ use std::path::PathBuf;
 /// Creates and returns the logging directory pointed to by `MULLVAD_LOG_DIR`, or the default
 /// one if that variable is unset.
 pub fn log_dir() -> Result<PathBuf> {
-    ::create_and_return(get_log_dir)
+    crate::create_and_return(get_log_dir)
 }
 
 /// Get the logging directory, but don't try to create it.
 pub fn get_log_dir() -> Result<PathBuf> {
     match env::var_os("MULLVAD_LOG_DIR") {
         Some(path) => Ok(PathBuf::from(path)),
-        None => get_default_log_dir().map(|dir| dir.join(::PRODUCT_NAME)),
+        None => get_default_log_dir().map(|dir| dir.join(crate::PRODUCT_NAME)),
     }
 }
 
diff --git a/mullvad-paths/src/settings.rs b/mullvad-paths/src/settings.rs
index 6f7a7fb867..33f2283a3f 100644
--- a/mullvad-paths/src/settings.rs
+++ b/mullvad-paths/src/settings.rs
@@ -1,4 +1,4 @@
-use Result;
+use crate::Result;
 
 use std::env;
 use std::path::PathBuf;
@@ -6,13 +6,13 @@ use std::path::PathBuf;
 /// Creates and returns the settings directory pointed to by `MULLVAD_SETTINGS_DIR`, or the default
 /// one if that variable is unset.
 pub fn settings_dir() -> Result<PathBuf> {
-    ::create_and_return(get_settings_dir)
+    crate::create_and_return(get_settings_dir)
 }
 
 fn get_settings_dir() -> Result<PathBuf> {
     match env::var_os("MULLVAD_SETTINGS_DIR") {
         Some(path) => Ok(PathBuf::from(path)),
-        None => get_default_settings_dir().map(|dir| dir.join(::PRODUCT_NAME)),
+        None => get_default_settings_dir().map(|dir| dir.join(crate::PRODUCT_NAME)),
     }
 }
 
diff --git a/mullvad-rpc/src/cached_dns_resolver.rs b/mullvad-rpc/src/cached_dns_resolver.rs
index e8ee652163..a20c0db973 100644
--- a/mullvad-rpc/src/cached_dns_resolver.rs
+++ b/mullvad-rpc/src/cached_dns_resolver.rs
@@ -363,7 +363,7 @@ mod tests {
         let address = cache.resolve();
 
         assert_eq!(address, fallback_address);
-        let cache_file_path = cache_dir.join(::API_IP_CACHE_FILENAME);
+        let cache_file_path = cache_dir.join(crate::API_IP_CACHE_FILENAME);
         assert!(!cache_file_path.exists());
     }
 
@@ -377,7 +377,7 @@ mod tests {
     }
 
     fn write_invalid_address(dir: &Path) -> PathBuf {
-        let file_path = dir.join(::API_IP_CACHE_FILENAME);
+        let file_path = dir.join(crate::API_IP_CACHE_FILENAME);
         let mut file = File::create(&file_path).unwrap();
 
         writeln!(file, "400.30.12.9").unwrap();
@@ -386,7 +386,7 @@ mod tests {
     }
 
     fn write_address(dir: &Path, address: IpAddr) -> PathBuf {
-        let file_path = dir.join(::API_IP_CACHE_FILENAME);
+        let file_path = dir.join(crate::API_IP_CACHE_FILENAME);
         let mut file = File::create(&file_path).unwrap();
 
         writeln!(file, "{}", address).unwrap();
@@ -403,7 +403,7 @@ mod tests {
     }
 
     fn get_cached_address(cache_dir: &Path) -> String {
-        let cache_file_path = cache_dir.join(::API_IP_CACHE_FILENAME);
+        let cache_file_path = cache_dir.join(crate::API_IP_CACHE_FILENAME);
 
         assert!(cache_file_path.exists());
 
@@ -421,7 +421,7 @@ mod tests {
         fallback_address: Option<IpAddr>,
     ) -> CachedDnsResolver<MockDnsResolver> {
         let hostname = String::from("dummy.host");
-        let cache_file = cache_dir.join(::API_IP_CACHE_FILENAME);
+        let cache_file = cache_dir.join(crate::API_IP_CACHE_FILENAME);
         let fallback_address = fallback_address.unwrap_or(IpAddr::from([10, 0, 109, 91]));
 
         CachedDnsResolver::with_dns_resolver(
diff --git a/mullvad-rpc/src/https_client_with_sni.rs b/mullvad-rpc/src/https_client_with_sni.rs
index 9c91cc8e7f..8ec091ac47 100644
--- a/mullvad-rpc/src/https_client_with_sni.rs
+++ b/mullvad-rpc/src/https_client_with_sni.rs
@@ -60,7 +60,7 @@ impl HttpsConnectorWithSni<HttpConnector> {
     /// This uses hyper's default `HttpConnector`, and default `TlsConnector`.
     /// If you wish to use something besides the defaults, use `From::from`.
     pub fn new<P: AsRef<Path>>(ca_path: P, handle: &Handle) -> Result<Self, ErrorStack> {
-        let mut http = HttpConnector::new(::DNS_THREADS, handle);
+        let mut http = HttpConnector::new(crate::DNS_THREADS, handle);
         http.enforce_http(false);
         let mut ssl_builder = SslConnector::builder(SslMethod::tls())?;
         ssl_builder.set_ca_file(ca_path)?;
diff --git a/mullvad-rpc/src/lib.rs b/mullvad-rpc/src/lib.rs
index 71e9d353b7..30215976e7 100644
--- a/mullvad-rpc/src/lib.rs
+++ b/mullvad-rpc/src/lib.rs
@@ -44,10 +44,10 @@ pub mod event_loop;
 pub mod rest;
 
 mod cached_dns_resolver;
-use cached_dns_resolver::CachedDnsResolver;
+use crate::cached_dns_resolver::CachedDnsResolver;
 
 mod https_client_with_sni;
-use https_client_with_sni::{HttpsClientWithSni, HttpsConnectorWithSni};
+use crate::https_client_with_sni::{HttpsClientWithSni, HttpsConnectorWithSni};
 
 /// Number of threads in the thread pool doing DNS resolutions.
 /// Since DNS is resolved via blocking syscall they must be run on separate threads.
diff --git a/mullvad-rpc/src/rest.rs b/mullvad-rpc/src/rest.rs
index 2aaa54aa9b..ed68e57964 100644
--- a/mullvad-rpc/src/rest.rs
+++ b/mullvad-rpc/src/rest.rs
@@ -10,7 +10,7 @@ use hyper_openssl::openssl::error::ErrorStack;
 
 use tokio_core::reactor::Handle;
 
-use HttpsConnectorWithSni;
+use crate::HttpsConnectorWithSni;
 
 error_chain! {
     errors {
diff --git a/mullvad-types/src/lib.rs b/mullvad-types/src/lib.rs
index c04e42050c..905ff8aaf4 100644
--- a/mullvad-types/src/lib.rs
+++ b/mullvad-types/src/lib.rs
@@ -31,4 +31,4 @@ pub mod states;
 pub mod version;
 
 mod custom_tunnel;
-pub use custom_tunnel::*;
+pub use crate::custom_tunnel::*;
diff --git a/mullvad-types/src/relay_constraints.rs b/mullvad-types/src/relay_constraints.rs
index 2a2507fa47..59df5e902b 100644
--- a/mullvad-types/src/relay_constraints.rs
+++ b/mullvad-types/src/relay_constraints.rs
@@ -1,5 +1,5 @@
-use location::{CityCode, CountryCode, Hostname};
-use CustomTunnelEndpoint;
+use crate::location::{CityCode, CountryCode, Hostname};
+use crate::CustomTunnelEndpoint;
 
 use std::fmt;
 
diff --git a/mullvad-types/src/relay_list.rs b/mullvad-types/src/relay_list.rs
index 5f24285dac..f89ae16559 100644
--- a/mullvad-types/src/relay_list.rs
+++ b/mullvad-types/src/relay_list.rs
@@ -1,4 +1,4 @@
-use location::{CityCode, CountryCode, Location};
+use crate::location::{CityCode, CountryCode, Location};
 
 use std::net::Ipv4Addr;
 
diff --git a/mullvad-types/src/settings.rs b/mullvad-types/src/settings.rs
index e78ab3c422..15e336dae4 100644
--- a/mullvad-types/src/settings.rs
+++ b/mullvad-types/src/settings.rs
@@ -1,9 +1,9 @@
 extern crate serde_json;
 
-use log::{debug, info};
-use relay_constraints::{
+use crate::relay_constraints::{
     Constraint, LocationConstraint, RelayConstraints, RelaySettings, RelaySettingsUpdate,
 };
+use log::{debug, info};
 
 use std::fs::File;
 use std::io;
diff --git a/talpid-openvpn-plugin/src/lib.rs b/talpid-openvpn-plugin/src/lib.rs
index 7df83b457f..fd627efd97 100644
--- a/talpid-openvpn-plugin/src/lib.rs
+++ b/talpid-openvpn-plugin/src/lib.rs
@@ -26,7 +26,7 @@ use std::sync::Mutex;
 
 
 mod processing;
-use processing::EventProcessor;
+use crate::processing::EventProcessor;
 
 
 error_chain!{
@@ -59,10 +59,10 @@ pub static INTERESTING_EVENTS: &'static [EventType] = &[
 ];
 
 openvpn_plugin!(
-    ::openvpn_open,
-    ::openvpn_close,
-    ::openvpn_event,
-    ::Mutex<EventProcessor>
+    crate::openvpn_open,
+    crate::openvpn_close,
+    crate::openvpn_event,
+    crate::Mutex<EventProcessor>
 );
 
 pub struct Arguments {
diff --git a/talpid-openvpn-plugin/src/processing.rs b/talpid-openvpn-plugin/src/processing.rs
index 900340820c..bc896cc3b3 100644
--- a/talpid-openvpn-plugin/src/processing.rs
+++ b/talpid-openvpn-plugin/src/processing.rs
@@ -1,11 +1,11 @@
 extern crate futures;
 
 use super::Arguments;
+use crate::openvpn_plugin;
 use jsonrpc_client_core::{
     expand_params, jsonrpc_client, Future, Result as ClientResult, Transport,
 };
 use jsonrpc_client_ipc::IpcTransport;
-use openvpn_plugin;
 use std::{collections::HashMap, thread};
 use tokio::{reactor::Handle, runtime::Runtime};