summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-03-06 15:23:12 +0100
committerLinus Färnstrand <linus@mullvad.net>2017-03-06 15:23:12 +0100
commit379172f8b87aebc9f2e7c4327d6d3ef744f9dc93 (patch)
treee644230f3cb7e27d0a74624e21b3ca0537989be1
parent1e62f77263526e3190d36f672b9df797225a4a2f (diff)
downloadmullvadvpn-379172f8b87aebc9f2e7c4327d6d3ef744f9dc93.tar.xz
mullvadvpn-379172f8b87aebc9f2e7c4327d6d3ef744f9dc93.zip
Rustfmt import fixes
-rw-r--r--src/process/openvpn.rs4
-rw-r--r--talpid_cli/src/main.rs2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/process/openvpn.rs b/src/process/openvpn.rs
index 52b16ad065..65f87064ff 100644
--- a/src/process/openvpn.rs
+++ b/src/process/openvpn.rs
@@ -1,3 +1,5 @@
+use super::monitor::ChildSpawner;
+
use clonablechild::{ClonableChild, ChildExt};
use net::{RemoteAddr, ToRemoteAddrs};
@@ -8,8 +10,6 @@ use std::io;
use std::path::{Path, PathBuf};
use std::process::{Command, Child, Stdio};
-use super::monitor::ChildSpawner;
-
/// An OpenVPN process builder, providing control over the different arguments that the OpenVPN
/// binary accepts.
#[derive(Clone)]
diff --git a/talpid_cli/src/main.rs b/talpid_cli/src/main.rs
index f2e54dcf2f..552e47bdc7 100644
--- a/talpid_cli/src/main.rs
+++ b/talpid_cli/src/main.rs
@@ -11,8 +11,8 @@ use std::io::{self, Read, Write};
use std::sync::mpsc::{self, Receiver};
use std::thread;
-use talpid_core::process::openvpn::OpenVpnCommand;
use talpid_core::process::monitor::{ChildMonitor, ChildSpawner};
+use talpid_core::process::openvpn::OpenVpnCommand;
mod cli;