---

yaml
---
r: 69222
b: refs/heads/auto
c: 155470f
h: refs/heads/master
v: v3

Author: olsonjeffery

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 5da29e3278b639540679e88fc7dd008435066e9a
+refs/heads/auto: 155470fc9cd8e1cdfd0f6ecc558f865f54c1ef29
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libstd/rt/io/mod.rs

@@ -298,7 +298,7 @@ mod extensions;
 mod support;
 
 /// Basic Timer
-mod timer;
+pub mod timer;
 
 /// Thread-blocking implementations
 pub mod native {

branches/auto/src/libstd/rt/io/timer.rs

@@ -17,19 +17,19 @@ use rt::local::Local;
 pub struct Timer(~RtioTimerObject);
 
 impl Timer {
-    fn new(i: ~RtioTimerObject) -> Timer {
+    fn new_on_rt(i: ~RtioTimerObject) -> Timer {
         Timer(i)
     }
 
-    pub fn init() -> Option<Timer> {
+    pub fn new() -> Option<Timer> {
         let timer = unsafe {
             rtdebug!("Timer::init: borrowing io to init timer");
             let io = Local::unsafe_borrow::<IoFactoryObject>();
             rtdebug!("about to init timer");
             (*io).timer_init()
         };
         match timer {
-            Ok(t) => Some(Timer::new(t)),
+            Ok(t) => Some(Timer::new_on_rt(t)),
             Err(ioerr) => {
                 rtdebug!("Timer::init: failed to init: %?", ioerr);
                 io_error::cond.raise(ioerr);
@@ -53,7 +53,7 @@ mod test {
     #[test]
     fn test_io_timer_sleep_simple() {
         do run_in_newsched_task {
-            let timer = Timer::init();
+            let timer = Timer::new();
             match timer {
                 Some(t) => t.sleep(1),
                 None => assert!(false)