Skip to content

Commit 155470f

Browse files
committed
std: minor timer cleanup based on feedback
1 parent 5da29e3 commit 155470f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/libstd/rt/io/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ mod extensions;
298298
mod support;
299299

300300
/// Basic Timer
301-
mod timer;
301+
pub mod timer;
302302

303303
/// Thread-blocking implementations
304304
pub mod native {

src/libstd/rt/io/timer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ use rt::local::Local;
1717
pub struct Timer(~RtioTimerObject);
1818

1919
impl Timer {
20-
fn new(i: ~RtioTimerObject) -> Timer {
20+
fn new_on_rt(i: ~RtioTimerObject) -> Timer {
2121
Timer(i)
2222
}
2323

24-
pub fn init() -> Option<Timer> {
24+
pub fn new() -> Option<Timer> {
2525
let timer = unsafe {
2626
rtdebug!("Timer::init: borrowing io to init timer");
2727
let io = Local::unsafe_borrow::<IoFactoryObject>();
2828
rtdebug!("about to init timer");
2929
(*io).timer_init()
3030
};
3131
match timer {
32-
Ok(t) => Some(Timer::new(t)),
32+
Ok(t) => Some(Timer::new_on_rt(t)),
3333
Err(ioerr) => {
3434
rtdebug!("Timer::init: failed to init: %?", ioerr);
3535
io_error::cond.raise(ioerr);
@@ -53,7 +53,7 @@ mod test {
5353
#[test]
5454
fn test_io_timer_sleep_simple() {
5555
do run_in_newsched_task {
56-
let timer = Timer::init();
56+
let timer = Timer::new();
5757
match timer {
5858
Some(t) => t.sleep(1),
5959
None => assert!(false)

0 commit comments

Comments
 (0)