diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-03-16 09:52:34 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-03-16 09:52:34 +0100 |
| commit | c0d0e813d560958b0e618091cd8bf682e8b70998 (patch) | |
| tree | d6fd62f9a99484254eb5afb4c6d22d8942fdaf55 /src | |
| parent | f34a0d45dadfc0a7432b8dc76aa0e8cc1e677c01 (diff) | |
| download | mullvadvpn-c0d0e813d560958b0e618091cd8bf682e8b70998.tar.xz mullvadvpn-c0d0e813d560958b0e618091cd8bf682e8b70998.zip | |
Make use of bail! macro in error_chain
Diffstat (limited to 'src')
| -rw-r--r-- | src/net.rs | 2 | ||||
| -rw-r--r-- | src/process/monitor.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net.rs b/src/net.rs index fb119ea8af..3701ae641e 100644 --- a/src/net.rs +++ b/src/net.rs @@ -61,7 +61,7 @@ impl RemoteAddr { })?; if address.is_empty() || address.contains(':') { let msg = format!("Invalid IP or domain: \"{}\"", address); - return Err(ErrorKind::AddrParse(msg).into()); + bail!(ErrorKind::AddrParse(msg)); } Ok(RemoteAddr::Domain(address.to_owned(), port)) } 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); } } } |
