diff options
| author | bors <bors@rust-lang.org> | 2017-06-29 06:20:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-29 06:20:17 +0000 |
| commit | dc2003b7cc1af7d7beee0b1ceec3d811c28cb35e (patch) | |
| tree | c4b66cccae863ec80fd56d0dbf90240af453849b /src/libstd/sys/redox | |
| parent | 0816b94f02e1cd20031b764370ed74102963527d (diff) | |
| parent | 87f6d6249c6841bcf4997146afb6390b79b71d98 (diff) | |
| download | rust-dc2003b7cc1af7d7beee0b1ceec3d811c28cb35e.tar.gz rust-dc2003b7cc1af7d7beee0b1ceec3d811c28cb35e.zip | |
Auto merge of #42848 - ids1024:redox-fix, r=sfackler
Fix Redox build, broken in ecbb896b9eb2acadefde57be493e4298c1aa04a3
Diffstat (limited to 'src/libstd/sys/redox')
| -rw-r--r-- | src/libstd/sys/redox/net/tcp.rs | 1 | ||||
| -rw-r--r-- | src/libstd/sys/redox/pipe.rs | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/sys/redox/net/tcp.rs b/src/libstd/sys/redox/net/tcp.rs index ac3fd2ad6b9..17673f0bd60 100644 --- a/src/libstd/sys/redox/net/tcp.rs +++ b/src/libstd/sys/redox/net/tcp.rs @@ -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}; diff --git a/src/libstd/sys/redox/pipe.rs b/src/libstd/sys/redox/pipe.rs index 05863adf108..28645facd93 100644 --- a/src/libstd/sys/redox/pipe.rs +++ b/src/libstd/sys/redox/pipe.rs @@ -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(()) |