diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-01-25 10:13:12 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-01-25 10:13:12 +0100 |
| commit | 12fb13374a022cee7076d985c3f2fe575a0af5b6 (patch) | |
| tree | 4c189a8b09b0c12369c0cc48ef9546639d61d211 /src/process/monitor.rs | |
| parent | 789b2ff929cf567cbf89628e487f656e00f08e3a (diff) | |
| parent | e6641f1c6f4b0220bb1b607b8cd04d3531fb1392 (diff) | |
| download | mullvadvpn-12fb13374a022cee7076d985c3f2fe575a0af5b6.tar.xz mullvadvpn-12fb13374a022cee7076d985c3f2fe575a0af5b6.zip | |
Merge branch 'rustfmt-upgrade'
Diffstat (limited to 'src/process/monitor.rs')
| -rw-r--r-- | src/process/monitor.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/process/monitor.rs b/src/process/monitor.rs index 2b88271ca9..b2080b93de 100644 --- a/src/process/monitor.rs +++ b/src/process/monitor.rs @@ -135,9 +135,7 @@ fn spawn_state_machine<C, B>(builder: B) -> Sender<MonitorMsg> { let state_machine = StateMachine::new(builder); let tx = state_machine.get_handle(); - thread::spawn(move || { - state_machine.run(); - }); + thread::spawn(move || { state_machine.run(); }); tx } @@ -295,13 +293,13 @@ impl Drop for ChildMonitor { #[cfg(test)] mod child_monitor { + use super::*; use std::io; use std::process::{ChildStdout, ChildStderr}; use std::sync::{Arc, Mutex}; use std::sync::mpsc::{self, Sender, Receiver}; use std::thread; use std::time::Duration; - use super::*; #[derive(Clone)] struct MockChild { |
