summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/net.rs2
-rw-r--r--src/process/monitor.rs4
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);
}
}
}