user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #56419 - mark-i-m:remove-try, r=Centril

Browse source 
Remove some uses of try!
This commit is contained in:
kennytm 2018-12-03 18:07:15 +08:00 • committed by GitHub
commit ca98bce303
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/sys/windows/stdio.rs
View file

@ -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);