summaryrefslogtreecommitdiffhomepage
path: root/talpid-core/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-01-18 17:20:05 +0100
committerLinus Färnstrand <linus@mullvad.net>2019-01-18 17:43:17 +0100
commitd3e316acb7af71e7733702e05eb8c1d5137ebccc (patch)
tree87929dd17c1c92859cffcd8f4ab85c3a968e347c /talpid-core/src
parent801612b89a7ea7f093b44c8a7028cde54ac31230 (diff)
downloadmullvadvpn-d3e316acb7af71e7733702e05eb8c1d5137ebccc.tar.xz
mullvadvpn-d3e316acb7af71e7733702e05eb8c1d5137ebccc.zip
Upgrade the remaining crates to Rust 2018
Diffstat (limited to 'talpid-core/src')
-rw-r--r--talpid-core/src/offline/linux.rs5
-rw-r--r--talpid-core/src/offline/mod.rs2
2 files changed, 2 insertions, 5 deletions
diff --git a/talpid-core/src/offline/linux.rs b/talpid-core/src/offline/linux.rs
index cf0daca86a..ccd5649c40 100644
--- a/talpid-core/src/offline/linux.rs
+++ b/talpid-core/src/offline/linux.rs
@@ -3,11 +3,9 @@ extern crate netlink_socket;
extern crate rtnetlink;
use std::{collections::BTreeSet, thread};
-
use error_chain::ChainedError;
use futures::{future::Either, sync::mpsc::UnboundedSender, Future, Stream};
use log::{error, trace, warn};
-
use self::{
iproute2::Link,
netlink_socket::{Protocol, SocketAddr, TokioSocket},
@@ -16,8 +14,7 @@ use self::{
NetlinkMessage, RtnlMessage,
},
};
-
-use tunnel_state_machine::TunnelCommand;
+use crate::tunnel_state_machine::TunnelCommand;
error_chain! {
errors {
diff --git a/talpid-core/src/offline/mod.rs b/talpid-core/src/offline/mod.rs
index e73de2efc1..db1e52c9c7 100644
--- a/talpid-core/src/offline/mod.rs
+++ b/talpid-core/src/offline/mod.rs
@@ -1,5 +1,5 @@
use futures::sync::mpsc::UnboundedSender;
-use tunnel_state_machine::TunnelCommand;
+use crate::tunnel_state_machine::TunnelCommand;
#[cfg(target_os = "macos")]
#[path = "macos.rs"]