diff options
| author | bors <bors@rust-lang.org> | 2016-09-13 22:41:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-13 22:41:34 -0700 |
| commit | 739d57180fa207410b8858f8cede7b8a9ea6f01e (patch) | |
| tree | 48bd42052665b2f0b5c7b82ffadd10d0e1844a53 /src/libstd | |
| parent | b1363a73ede57ae595f3a1be2bb75d308ba4f7f6 (diff) | |
| parent | 694d601dbc2df575c32a490a529656a864dc0a2e (diff) | |
| download | rust-739d57180fa207410b8858f8cede7b8a9ea6f01e.tar.gz rust-739d57180fa207410b8858f8cede7b8a9ea6f01e.zip | |
Auto merge of #36041 - ahmedcharles:try, r=nrc
Replace try! with ?.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sync/mpsc/oneshot.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync/mpsc/stream.rs | 3 | ||||
| -rw-r--r-- | src/libstd/sys/common/backtrace.rs | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/libstd/sync/mpsc/oneshot.rs b/src/libstd/sync/mpsc/oneshot.rs index 7a35ea6bbaa..7389280b853 100644 --- a/src/libstd/sync/mpsc/oneshot.rs +++ b/src/libstd/sync/mpsc/oneshot.rs @@ -150,7 +150,7 @@ impl<T> Packet<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(); diff --git a/src/libstd/sync/mpsc/stream.rs b/src/libstd/sync/mpsc/stream.rs index aa1254c8641..61c8316467d 100644 --- a/src/libstd/sync/mpsc/stream.rs +++ b/src/libstd/sync/mpsc/stream.rs @@ -187,8 +187,7 @@ impl<T> Packet<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(); diff --git a/src/libstd/sys/common/backtrace.rs b/src/libstd/sys/common/backtrace.rs index a509b80eaca..a8540fed928 100644 --- a/src/libstd/sys/common/backtrace.rs +++ b/src/libstd/sys/common/backtrace.rs @@ -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; } |