Skip to content

Commit 637f149

Browse files
committed
Use question_mark feature in libstd.
1 parent d73e374 commit 637f149

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/libstd/sync/mpsc/oneshot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ impl<T> Packet<T> {
150150
let timed_out = !wait_token.wait_max_until(deadline);
151151
// Try to reset the state
152152
if timed_out {
153-
try!(self.abort_selection().map_err(Upgraded));
153+
self.abort_selection().map_err(Upgraded)?;
154154
}
155155
} else {
156156
wait_token.wait();

src/libstd/sync/mpsc/stream.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@ impl<T> Packet<T> {
187187
if let Some(deadline) = deadline {
188188
let timed_out = !wait_token.wait_max_until(deadline);
189189
if timed_out {
190-
try!(self.abort_selection(/* was_upgrade = */ false)
191-
.map_err(Upgraded));
190+
self.abort_selection(/* was_upgrade = */ false).map_err(Upgraded)?;
192191
}
193192
} else {
194193
wait_token.wait();

src/libstd/sys/common/backtrace.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,11 @@ pub fn demangle(writer: &mut Write, s: &str) -> io::Result<()> {
153153
macro_rules! demangle {
154154
($($pat:expr => $demangled:expr),*) => ({
155155
$(if rest.starts_with($pat) {
156-
try!(writer.write_all($demangled));
156+
writer.write_all($demangled)?;
157157
rest = &rest[$pat.len()..];
158158
} else)*
159159
{
160-
try!(writer.write_all(rest.as_bytes()));
160+
writer.write_all(rest.as_bytes())?;
161161
break;
162162
}
163163

0 commit comments

Comments
 (0)