diff options
Diffstat (limited to 'src/process')
| -rw-r--r-- | src/process/monitor.rs | 4 | ||||
| -rw-r--r-- | src/process/openvpn.rs | 2 |
2 files changed, 3 insertions, 3 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); } } } diff --git a/src/process/openvpn.rs b/src/process/openvpn.rs index b6d82f02a9..e002d2b9c3 100644 --- a/src/process/openvpn.rs +++ b/src/process/openvpn.rs @@ -119,7 +119,7 @@ impl OpenVpnCommand { if let Some((ref path, ref plugin_args)) = self.plugin { args.push(OsString::from("--plugin")); args.push(OsString::from(path)); - args.extend(plugin_args.iter().map(|arg| OsString::from(arg))); + args.extend(plugin_args.iter().map(OsString::from)); } args } |
