std: Rename uv::hl to uv::iotask. Additional cleanup

1 files changed, 11 insertions, 10 deletions

diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs
index a350967802f..806b14c717d 100644
--- a/src/libstd/uv_global_loop.rs
+++ b/src/libstd/uv_global_loop.rs
@@ -5,8 +5,9 @@ A process-wide libuv event loop for library use.
 export get, get_monitor_task_gl;
 
 import ll = uv_ll;
-import hl = uv_hl;
+import iotask = uv_iotask;
 import get_gl = get;
+import iotask::{iotask, spawn_iotask};
 import priv::{chan_from_global_ptr, weaken_task};
 import comm::{port, chan, methods, select2, listen};
 import either::{left, right};
@@ -27,12 +28,12 @@ loop that this function returns.
 * A `hl::high_level_loop` that encapsulates communication with the global
 loop.
 "]
-fn get() -> hl::high_level_loop {
+fn get() -> iotask {
     ret get_monitor_task_gl();
 }
 
 #[doc(hidden)]
-fn get_monitor_task_gl() -> hl::high_level_loop unsafe {
+fn get_monitor_task_gl() -> iotask unsafe {
 
     let monitor_loop_chan_ptr = rustrt::rust_uv_get_kernel_global_chan_ptr();
 
@@ -53,7 +54,7 @@ fn get_monitor_task_gl() -> hl::high_level_loop unsafe {
     };
 
     #debug("before priv::chan_from_global_ptr");
-    type monchan = chan<hl::high_level_loop>;
+    type monchan = chan<iotask>;
 
     let monitor_ch = chan_from_global_ptr::<monchan>(monitor_loop_chan_ptr,
                                                      builder_fn) {|msg_po|
@@ -70,7 +71,7 @@ fn get_monitor_task_gl() -> hl::high_level_loop unsafe {
                     // all normal tasks have ended, tell the
                     // libuv loop to tear_down, then exit
                     #debug("weak_exit_po recv'd msg: %?", weak_exit);
-                    hl::exit(hl_loop);
+                    iotask::exit(hl_loop);
                     break;
                   }
                   right(fetch_ch) {
@@ -92,7 +93,7 @@ fn get_monitor_task_gl() -> hl::high_level_loop unsafe {
     }
 }
 
-fn spawn_loop() -> hl::high_level_loop unsafe {
+fn spawn_loop() -> iotask unsafe {
     let builder = task::builder();
     task::add_wrapper(builder) {|task_body|
         fn~(move task_body) {
@@ -110,7 +111,7 @@ fn spawn_loop() -> hl::high_level_loop unsafe {
             }
         }
     }
-    hl::spawn_high_level_loop(builder)
+    spawn_iotask(builder)
 }
 
 #[cfg(test)]
@@ -128,7 +129,7 @@ mod test {
         log(debug, "in simple timer cb");
         ll::timer_stop(timer_ptr);
         let hl_loop = get_gl();
-        hl::interact(hl_loop) {|_loop_ptr|
+        iotask::interact(hl_loop) {|_loop_ptr|
             log(debug, "closing timer");
             ll::close(timer_ptr, simple_timer_close_cb);
             log(debug, "about to deref exit_ch_ptr");
@@ -137,7 +138,7 @@ mod test {
         log(debug, "exiting simple timer cb");
     }
 
-    fn impl_uv_hl_simple_timer(hl_loop: hl::high_level_loop) unsafe {
+    fn impl_uv_hl_simple_timer(iotask: iotask) unsafe {
         let exit_po = comm::port::<bool>();
         let exit_ch = comm::chan(exit_po);
         let exit_ch_ptr = ptr::addr_of(exit_ch);
@@ -145,7 +146,7 @@ mod test {
                        exit_ch_ptr));
         let timer_handle = ll::timer_t();
         let timer_ptr = ptr::addr_of(timer_handle);
-        hl::interact(hl_loop) {|loop_ptr|
+        iotask::interact(iotask) {|loop_ptr|
             log(debug, "user code inside interact loop!!!");
             let init_status = ll::timer_init(loop_ptr, timer_ptr);
             if(init_status == 0i32) {