Skip to content

Commit 73921f9

Browse files
committed
auto merge of #7883 : brson/rust/rm-std-net, r=graydon
This removes all the code from libextra that depends on libuv. After that it removes three runtime features that existed to support the global uv loop: weak tasks, runtime-global variables, and at_exit handlers. The networking code doesn't have many users besides servo, so shouldn't have much fallout. The timer code though is useful and will probably break out-of-tree code until the new scheduler lands, but I expect that to be soon. It also incidentally moves `os::change_dir_locked` to `std::unstable`. This is a function used by test cases to avoid cwd races and in my opinion shouldn't be public (#7870). Closes #7251 and #7870
2 parents 9ed82fb + 407bffb commit 73921f9

27 files changed

+83
-5978
lines changed

src/libextra/extra.rs

+1-14
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,9 @@ use std::str::{StrSlice, OwnedStr};
3636

3737
pub use std::os;
3838

39-
pub mod uv_ll;
40-
41-
// General io and system-services modules
42-
43-
#[path = "net/mod.rs"]
44-
pub mod net;
45-
46-
// libuv modules
47-
pub mod uv;
48-
pub mod uv_iotask;
49-
pub mod uv_global_loop;
50-
51-
5239
// Utility modules
5340

5441
pub mod c_vec;
55-
pub mod timer;
5642
pub mod io_util;
5743
pub mod rc;
5844

@@ -90,6 +76,7 @@ pub mod sha2;
9076

9177
// And ... other stuff
9278

79+
pub mod url;
9380
pub mod ebml;
9481
pub mod dbg;
9582
pub mod getopts;

src/libextra/flatpipes.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,6 @@ mod test {
639639
use flatpipes::serial;
640640
use io_util::BufReader;
641641
use flatpipes::{BytePort, FlatChan, FlatPort};
642-
use net::tcp::TcpSocketBuf;
643642

644643
use std::comm;
645644
use std::int;
@@ -728,7 +727,8 @@ mod test {
728727
}
729728

730729
// FIXME #2064: Networking doesn't work on x86
731-
#[test]
730+
// XXX Broken until networking support is added back
731+
/*#[test]
732732
#[cfg(target_arch = "x86_64")]
733733
fn test_pod_tcp_stream() {
734734
fn reader_port(buf: TcpSocketBuf
@@ -745,6 +745,7 @@ mod test {
745745
#[test]
746746
#[cfg(target_arch = "x86_64")]
747747
fn test_serializing_tcp_stream() {
748+
// XXX Broken until networking support is added back
748749
fn reader_port(buf: TcpSocketBuf
749750
) -> serial::ReaderPort<int, TcpSocketBuf> {
750751
serial::reader_port(buf)
@@ -860,7 +861,7 @@ mod test {
860861
}
861862
862863
finish_port.recv();
863-
}
864+
}*/
864865

865866
// Tests that the different backends behave the same when the
866867
// binary streaming protocol is broken

0 commit comments

Comments
 (0)