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

Auto merge of #42848 - ids1024:redox-fix, r=sfackler

Browse source 
Fix Redox build, broken in ecbb896b9e
This commit is contained in:
bors 2017-06-29 06:20:17 +00:00
commit dc2003b7cc
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libstd/sys/redox/net/tcp.rs
View file

@ -17,7 +17,6 @@ use sys::fs::{File, OpenOptions};
use sys::syscall::TimeSpec;
use sys_common::{AsInner, FromInner, IntoInner};
use time::Duration;
use vec::Vec;
use super::{path_to_peer_addr, path_to_local_addr};

4
src/libstd/sys/redox/pipe.rs
View file

@ -49,8 +49,8 @@ pub fn read2(p1: AnonPipe,
//FIXME: Use event based I/O multiplexing
//unimplemented!()
p1.read_to_end(v1)?;
p2.read_to_end(v2)?;
p1.0.read_to_end(v1)?;
p2.0.read_to_end(v2)?;
Ok(())