提交 637f1492 编写于 作者: A Ahmed Charles

Use question_mark feature in libstd.

上级 d73e374d
......@@ -150,7 +150,7 @@ pub fn recv(&mut self, deadline: Option<Instant>) -> Result<T, Failure<T>> {
let timed_out = !wait_token.wait_max_until(deadline);
// Try to reset the state
if timed_out {
try!(self.abort_selection().map_err(Upgraded));
self.abort_selection().map_err(Upgraded)?;
}
} else {
wait_token.wait();
......
......@@ -187,8 +187,7 @@ pub fn recv(&mut self, deadline: Option<Instant>) -> Result<T, Failure<T>> {
if let Some(deadline) = deadline {
let timed_out = !wait_token.wait_max_until(deadline);
if timed_out {
try!(self.abort_selection(/* was_upgrade = */ false)
.map_err(Upgraded));
self.abort_selection(/* was_upgrade = */ false).map_err(Upgraded)?;
}
} else {
wait_token.wait();
......
......@@ -153,11 +153,11 @@ pub fn demangle(writer: &mut Write, s: &str) -> io::Result<()> {
macro_rules! demangle {
($($pat:expr => $demangled:expr),*) => ({
$(if rest.starts_with($pat) {
try!(writer.write_all($demangled));
writer.write_all($demangled)?;
rest = &rest[$pat.len()..];
} else)*
{
try!(writer.write_all(rest.as_bytes()));
writer.write_all(rest.as_bytes())?;
break;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册