diff options
| author | bors <bors@rust-lang.org> | 2018-12-03 15:44:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-03 15:44:43 +0000 |
| commit | 0c999ed132d67bf2520643e9bd619972cf3888ba (patch) | |
| tree | e9dfee00ab60ea6aaa3fb48c0867fe4d5db3cf1e /src/libstd/sys | |
| parent | 9cd3bef4cfaaac2a608682d4b0834cda344249e0 (diff) | |
| parent | ac363d8793a1c6b69822a583e6f7d0b2f9904c86 (diff) | |
| download | rust-0c999ed132d67bf2520643e9bd619972cf3888ba.tar.gz rust-0c999ed132d67bf2520643e9bd619972cf3888ba.zip | |
Auto merge of #56451 - kennytm:rollup, r=kennytm
Rollup of 13 pull requests Successful merges: - #56141 ([std] Osstr len clarity) - #56366 (Stabilize self_in_typedefs feature) - #56395 (Stabilize dbg!(...)) - #56401 (Move VecDeque::resize_with out of the impl<T:Clone> block) - #56402 (Improve the unstable book example for #[marker] trait) - #56412 (Update tracking issue for `extern_crate_self`) - #56416 (Remove unneeded body class selector) - #56418 (Fix failing tidy (line endings on Windows)) - #56419 (Remove some uses of try!) - #56432 (Update issue number of `shrink_to` methods to point the tracking issue) - #56433 (Add description about `crate` for parse_visibility's comment) - #56435 (make the C part of compiler-builtins opt-out) - #56438 (Remove not used `DotEq` token) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/stdio.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/stdio.rs b/src/libstd/sys/windows/stdio.rs index 81b89da21d3..c3a94698a0f 100644 --- a/src/libstd/sys/windows/stdio.rs +++ b/src/libstd/sys/windows/stdio.rs @@ -48,7 +48,7 @@ pub fn get(handle: c::DWORD) -> io::Result<Output> { } fn write(handle: c::DWORD, data: &[u8]) -> io::Result<usize> { - let handle = match try!(get(handle)) { + let handle = match get(handle)? { Output::Console(c) => c, Output::Pipe(p) => { let handle = Handle::new(p); @@ -99,7 +99,7 @@ impl Stdin { } pub fn read(&self, buf: &mut [u8]) -> io::Result<usize> { - let handle = match try!(get(c::STD_INPUT_HANDLE)) { + let handle = match get(c::STD_INPUT_HANDLE)? { Output::Console(c) => c, Output::Pipe(p) => { let handle = Handle::new(p); |
