diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-03-20 08:18:23 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-03-20 08:18:23 +0100 |
| commit | 1898a8e604ccfec4cb30c48dcfb75654898210d3 (patch) | |
| tree | a9d9c138bb56eedb51d946b3b6e7ea69c8a1c02e /src/process/monitor.rs | |
| parent | c319871bd879b622ab479d02dcbe644fdc4a5a5b (diff) | |
| parent | 1ca4c2c4f6a7f1364eb0e5229ee17bb84ed05899 (diff) | |
| download | mullvadvpn-1898a8e604ccfec4cb30c48dcfb75654898210d3.tar.xz mullvadvpn-1898a8e604ccfec4cb30c48dcfb75654898210d3.zip | |
Merge branch 'clippy-cleanup'
Diffstat (limited to 'src/process/monitor.rs')
| -rw-r--r-- | src/process/monitor.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/process/monitor.rs b/src/process/monitor.rs index 070cbdf196..3a6f9fb65f 100644 --- a/src/process/monitor.rs +++ b/src/process/monitor.rs @@ -91,7 +91,7 @@ impl<S: ChildSpawner> ChildMonitor<S> { }); Ok(io) } else { - Err(ErrorKind::InvalidState.into()) + bail!(ErrorKind::InvalidState); } } @@ -116,7 +116,7 @@ impl<S: ChildSpawner> ChildMonitor<S> { running_state.child.kill().chain_err(|| ErrorKind::Kill)?; Ok(()) } else { - Err(ErrorKind::InvalidState.into()) + bail!(ErrorKind::InvalidState); } } } |