core::rt Restructure some modules

Put all uv code under rt::uv, as if it were in its own crate.
Pull local_sched out of rt::sched.

Author: brson

src/libcore/rt/sched/local_sched.rs renamed to src/libcore/rt/local_sched.rs

@@ -16,12 +16,12 @@ use libc::c_void;
 use cast;
 use cell::Cell;
 
-use super::Scheduler;
-use super::super::rtio::IoFactoryObject;
-use tls = super::super::thread_local_storage;
+use rt::sched::Scheduler;
+use rt::rtio::{EventLoop, IoFactoryObject};
+use tls = rt::thread_local_storage;
 use unstable::finally::Finally;
 
-#[cfg(test)] use super::super::uvio::UvEventLoop;
+#[cfg(test)] use rt::uv::uvio::UvEventLoop;
 
 /// Give the Scheduler to thread-local storage
 pub fn put(sched: ~Scheduler) {

src/libcore/rt/mod.rs

@@ -21,10 +21,12 @@
 
 use libc::c_char;
 
-/// The Scheduler and Task types, and thread-local access thereof
-#[path = "sched/mod.rs"]
+/// The Scheduler and Task types
 mod sched;
 
+/// Thread-local access to the current Scheduler
+mod local_sched;
+
 /// Synchronous I/O
 #[path = "io/mod.rs"]
 pub mod io;
@@ -39,14 +41,7 @@ mod rtio;
 
 /// libuv
 #[path = "uv/mod.rs"]
-mod uv;
-
-/// The implementation of `rtio` for libuv
-mod uvio;
-
-/// C bindings to libuv
-pub mod uvll;
-
+pub mod uv;
 
 // FIXME #5248: The import in `sched` doesn't resolve unless this is pub!
 /// Bindings to pthread/windows thread-local storage
@@ -94,7 +89,7 @@ pub mod test;
 pub fn start(main: *u8, _argc: int, _argv: **c_char, _crate_map: *u8) -> int {
 
     use self::sched::{Scheduler, Task};
-    use self::uvio::UvEventLoop;
+    use self::uv::uvio::UvEventLoop;
     use sys::Closure;
     use ptr;
     use cast;
@@ -175,7 +170,7 @@ pub fn context() -> RuntimeContext {
 fn test_context() {
     use unstable::run_in_bare_thread;
     use self::sched::{local_sched, Task};
-    use self::uvio::UvEventLoop;
+    use rt::uv::uvio::UvEventLoop;
     use cell::Cell;
 
     assert!(context() == OldTaskContext);

src/libcore/rt/rtio.rs

@@ -13,13 +13,14 @@ use result::*;
 
 use rt::io::IoError;
 use super::io::net::ip::IpAddr;
+use rt::uv::uvio;
 
 // XXX: ~object doesn't work currently so these are some placeholder
 // types to use instead
-pub type EventLoopObject = super::uvio::UvEventLoop;
-pub type IoFactoryObject = super::uvio::UvIoFactory;
-pub type RtioTcpStreamObject = super::uvio::UvTcpStream;
-pub type RtioTcpListenerObject = super::uvio::UvTcpListener;
+pub type EventLoopObject = uvio::UvEventLoop;
+pub type IoFactoryObject = uvio::UvIoFactory;
+pub type RtioTcpStreamObject = uvio::UvTcpStream;
+pub type RtioTcpListenerObject = uvio::UvTcpListener;
 
 pub trait EventLoop {
     fn run(&mut self);

src/libcore/rt/sched/mod.rs renamed to src/libcore/rt/sched.rs

@@ -19,7 +19,7 @@ use super::context::Context;
 use super::local_services::LocalServices;
 use cell::Cell;
 
-#[cfg(test)] use super::uvio::UvEventLoop;
+#[cfg(test)] use rt::uv::uvio::UvEventLoop;
 #[cfg(test)] use unstable::run_in_bare_thread;
 #[cfg(test)] use int;
 

src/libcore/rt/test.rs

@@ -19,7 +19,7 @@ use rt::local_services::LocalServices;
 pub fn run_in_newsched_task(f: ~fn()) {
     use unstable::run_in_bare_thread;
     use super::sched::Task;
-    use super::uvio::UvEventLoop;
+    use rt::uv::uvio::UvEventLoop;
 
     let f = Cell(f);
 

src/libcore/rt/uv/file.rs

@@ -12,8 +12,8 @@ use prelude::*;
 use ptr::null;
 use libc::c_void;
 use super::{UvError, Callback, Request, NativeHandle, Loop};
-use super::super::uvll;
-use super::super::uvll::*;
+use rt::uv::uvll;
+use rt::uv::uvll::*;
 
 pub type FsCallback = ~fn(FsRequest, Option<UvError>);
 impl Callback for FsCallback { }

src/libcore/rt/uv/mod.rs

@@ -10,7 +10,7 @@
 
 /*!
 
-Bindings to libuv.
+Bindings to libuv, along with the default implementation of `core::rt::rtio`.
 
 UV types consist of the event loop (Loop), Watchers, Requests and
 Callbacks.
@@ -47,7 +47,6 @@ use cast::transmute;
 use ptr::null;
 use unstable::finally::Finally;
 
-use rt::uvll;
 use rt::io::IoError;
 
 #[cfg(test)] use unstable::run_in_bare_thread;
@@ -56,6 +55,13 @@ pub use self::file::{FsRequest, FsCallback};
 pub use self::net::{StreamWatcher, TcpWatcher};
 pub use self::net::{ReadCallback, AllocCallback, ConnectionCallback, ConnectCallback};
 
+
+/// The implementation of `rtio` for libuv
+pub mod uvio;
+
+/// C bindings to libuv
+pub mod uvll;
+
 pub mod file;
 pub mod net;
 
@@ -240,7 +246,7 @@ pub fn uv_error_to_io_error(uverr: UvError) -> IoError {
 
     unsafe {
         // Importing error constants
-        use rt::uvll::*;
+        use rt::uv::uvll::*;
         use rt::io::*;
 
         // uv error descriptions are static

src/libcore/rt/uv/net.rs

@@ -11,8 +11,8 @@
 use prelude::*;
 use libc::{size_t, ssize_t, c_int, c_void};
 use cast::transmute_mut_region;
-use super::super::uvll;
-use super::super::uvll::*;
+use rt::uv::uvll;
+use rt::uv::uvll::*;
 use super::{Loop, Watcher, Request, UvError, Buf, Callback, NativeHandle, NullCallback,
             loop_from_watcher, status_to_maybe_uv_error,
             install_watcher_data, get_watcher_data, drop_watcher_data,