Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 1 addition & 14 deletions src/libextra/extra.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,9 @@ use std::str::{StrSlice, OwnedStr};

pub use std::os;

pub mod uv_ll;

// General io and system-services modules

#[path = "net/mod.rs"]
pub mod net;

// libuv modules
pub mod uv;
pub mod uv_iotask;
pub mod uv_global_loop;


// Utility modules

pub mod c_vec;
pub mod timer;
pub mod io_util;
pub mod rc;

Expand Down Expand Up @@ -90,6 +76,7 @@ pub mod sha2;

// And ... other stuff

pub mod url;
pub mod ebml;
pub mod dbg;
pub mod getopts;
Expand Down
7 changes: 4 additions & 3 deletions src/libextra/flatpipes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,6 @@ mod test {
use flatpipes::serial;
use io_util::BufReader;
use flatpipes::{BytePort, FlatChan, FlatPort};
use net::tcp::TcpSocketBuf;

use std::comm;
use std::int;
Expand Down Expand Up @@ -728,7 +727,8 @@ mod test {
}

// FIXME #2064: Networking doesn't work on x86
#[test]
// XXX Broken until networking support is added back
/*#[test]
#[cfg(target_arch = "x86_64")]
fn test_pod_tcp_stream() {
fn reader_port(buf: TcpSocketBuf
Expand All @@ -745,6 +745,7 @@ mod test {
#[test]
#[cfg(target_arch = "x86_64")]
fn test_serializing_tcp_stream() {
// XXX Broken until networking support is added back
fn reader_port(buf: TcpSocketBuf
) -> serial::ReaderPort<int, TcpSocketBuf> {
serial::reader_port(buf)
Expand Down Expand Up @@ -860,7 +861,7 @@ mod test {
}

finish_port.recv();
}
}*/

// Tests that the different backends behave the same when the
// binary streaming protocol is broken
Expand Down
Loading