diff options
| author | bors <bors@rust-lang.org> | 2013-03-11 20:21:45 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-03-11 20:21:45 -0700 |
| commit | 48cb9a8ac0b95408a142ea7bc9767414eba2cbb3 (patch) | |
| tree | 2aa22a3dbbdbf2364a41feba5f358dfd3e979574 /src/libstd/std.rc | |
| parent | a6bb4a0f1a61ab00e09c4cb24dfff95c6c2481c7 (diff) | |
| parent | 676e0290ed4d306e6d7b517de1409c109309a0b2 (diff) | |
| download | rust-48cb9a8ac0b95408a142ea7bc9767414eba2cbb3.tar.gz rust-48cb9a8ac0b95408a142ea7bc9767414eba2cbb3.zip | |
auto merge of #5303 : brson/rust/newsched4, r=brson
r? Followup to #5022. This is the same, but everything is in `core::rt` now. `std::uv_ll` is moved to `core::unstable::uvll`, with the intent that it eventually move into its own crate (blocked on #5192 at least). I've had to disable the uv tests because of #2064. All of `core::rt` is disabled on platforms that aren't mac or linux until I complete the windows thread local storage bindings and ARM context switching. My immediate next priorities will be to fix #2064 and clean up the uv bindings, get everything building on all platforms.
Diffstat (limited to 'src/libstd/std.rc')
| -rw-r--r-- | src/libstd/std.rc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/std.rc b/src/libstd/std.rc index a3b18e50df2..85e914a60a1 100644 --- a/src/libstd/std.rc +++ b/src/libstd/std.rc @@ -36,6 +36,8 @@ not required in or otherwise suitable for the core library. extern mod core(vers = "0.6"); use core::*; +pub use uv_ll = core::unstable::uvll; + // General io and system-services modules pub mod net; @@ -45,7 +47,6 @@ pub mod net_url; // libuv modules pub mod uv; -pub mod uv_ll; pub mod uv_iotask; pub mod uv_global_loop; |