summaryrefslogtreecommitdiffhomepage
path: root/src/process
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-03-16 09:52:34 +0100
committerLinus Färnstrand <linus@mullvad.net>2017-03-16 09:52:34 +0100
commitc0d0e813d560958b0e618091cd8bf682e8b70998 (patch)
treed6fd62f9a99484254eb5afb4c6d22d8942fdaf55 /src/process
parentf34a0d45dadfc0a7432b8dc76aa0e8cc1e677c01 (diff)
downloadmullvadvpn-c0d0e813d560958b0e618091cd8bf682e8b70998.tar.xz
mullvadvpn-c0d0e813d560958b0e618091cd8bf682e8b70998.zip
Make use of bail! macro in error_chain
Diffstat (limited to 'src/process')
-rw-r--r--src/process/monitor.rs4
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);
}
}
}