summaryrefslogtreecommitdiffhomepage
path: root/talpid-core
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-01-18 17:23:00 +0100
committerLinus Färnstrand <linus@mullvad.net>2019-01-18 17:43:17 +0100
commit9a20cf40b4eedbd7fbb2aba45ed81724cbd538ac (patch)
treed136c995dd53e0b1d868c52e2e4f9c03ce00fd2c /talpid-core
parentd3e316acb7af71e7733702e05eb8c1d5137ebccc (diff)
downloadmullvadvpn-9a20cf40b4eedbd7fbb2aba45ed81724cbd538ac.tar.xz
mullvadvpn-9a20cf40b4eedbd7fbb2aba45ed81724cbd538ac.zip
Run rustfmt after Rust 2018 use statement cleanup
Diffstat (limited to 'talpid-core')
-rw-r--r--talpid-core/src/offline/linux.rs8
-rw-r--r--talpid-core/src/offline/mod.rs2
2 files changed, 5 insertions, 5 deletions
diff --git a/talpid-core/src/offline/linux.rs b/talpid-core/src/offline/linux.rs
index ccd5649c40..4a2d9b2888 100644
--- a/talpid-core/src/offline/linux.rs
+++ b/talpid-core/src/offline/linux.rs
@@ -2,10 +2,6 @@ extern crate iproute2;
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},
@@ -15,6 +11,10 @@ use self::{
},
};
use crate::tunnel_state_machine::TunnelCommand;
+use error_chain::ChainedError;
+use futures::{future::Either, sync::mpsc::UnboundedSender, Future, Stream};
+use log::{error, trace, warn};
+use std::{collections::BTreeSet, thread};
error_chain! {
errors {
diff --git a/talpid-core/src/offline/mod.rs b/talpid-core/src/offline/mod.rs
index db1e52c9c7..00b2544636 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 crate::tunnel_state_machine::TunnelCommand;
+use futures::sync::mpsc::UnboundedSender;
#[cfg(target_os = "macos")]
#[path = "macos.rs"]