Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Redox build, broken in ecbb896b9eb2acadefde57be493e4298c1aa04a3 #42848

Merged
merged 1 commit into from
Jun 29, 2017
+2 −3
Merged

Fix Redox build, broken in ecbb896b9eb2acadefde57be493e4298c1aa04a3 #42848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/libstd/sys/redox/net/tcp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down
4 changes: 2 additions & 2 deletions src/libstd/sys/redox/pipe.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(())

Expand Down