From 87f6d6249c6841bcf4997146afb6390b79b71d98 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Thu, 22 Jun 2017 19:14:26 -0700 Subject: [PATCH] Fix Redox build, broken in ecbb896b9eb2acadefde57be493e4298c1aa04a3 --- src/libstd/sys/redox/net/tcp.rs | 1 - 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 ac3fd2ad6b9be..17673f0bd60b3 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 05863adf108cc..28645facd93f8 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(())