Skip to content

Commit dc2003b

Browse files
committed
Auto merge of #42848 - ids1024:redox-fix, r=sfackler
Fix Redox build, broken in ecbb896
2 parents 0816b94 + 87f6d62 commit dc2003b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/libstd/sys/redox/net/tcp.rs

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ use sys::fs::{File, OpenOptions};
1717
use sys::syscall::TimeSpec;
1818
use sys_common::{AsInner, FromInner, IntoInner};
1919
use time::Duration;
20-
use vec::Vec;
2120

2221
use super::{path_to_peer_addr, path_to_local_addr};
2322

src/libstd/sys/redox/pipe.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ pub fn read2(p1: AnonPipe,
4949
//FIXME: Use event based I/O multiplexing
5050
//unimplemented!()
5151

52-
p1.read_to_end(v1)?;
53-
p2.read_to_end(v2)?;
52+
p1.0.read_to_end(v1)?;
53+
p2.0.read_to_end(v2)?;
5454

5555
Ok(())
5656

0 commit comments

Comments
 (0)