---

yaml
---
r: 51437
b: refs/heads/incoming
c: 9a075f2
h: refs/heads/master
i:
  51435: cca92e1
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 42cba98509c6da6e7f99d1d8c87f3051cb9598d4
+refs/heads/incoming: 9a075f264a1024a3c03edc033be59971ad590171
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/rt/mod.rs

@@ -30,7 +30,7 @@ macro_rules! rtdebug (
 )
 
 mod sched;
-mod io;
+mod rtio;
 pub mod uvll;
 mod uvio;
 mod uv;

branches/incoming/src/libcore/rt/io.rs renamed to branches/incoming/src/libcore/rt/rtio.rs

@@ -16,7 +16,7 @@ use ptr::mut_null;
 
 use super::work_queue::WorkQueue;
 use super::stack::{StackPool, StackSegment};
-use super::io::{EventLoop, EventLoopObject};
+use super::rtio::{EventLoop, EventLoopObject};
 use super::context::Context;
 use tls = super::thread_local_storage;
 

branches/incoming/src/libcore/rt/sched.rs

@@ -45,7 +45,7 @@ use ptr::null;
 use sys::size_of;
 use super::uvll;
 use super::uvll::*;
-use super::io::{IpAddr, Ipv4, Ipv6};
+use super::rtio::{IpAddr, Ipv4, Ipv6};
 use unstable::finally::Finally;
 
 #[cfg(test)] use unstable::run_in_bare_thread;

branches/incoming/src/libcore/rt/uv.rs

@@ -12,13 +12,11 @@ use option::*;
 use result::*;
 
 use super::uv::*;
-use super::io::*;
+use super::rtio::*;
 use ops::Drop;
 use cell::{Cell, empty_cell};
 use cast::transmute;
-use super::StreamObject;
 use super::sched::Scheduler;
-use super::IoFactoryObject;
 
 #[cfg(test)] use super::sched::Task;
 #[cfg(test)] use unstable::run_in_bare_thread;