bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

std: minor timer cleanup based on feedback

Browse source
This commit is contained in:
Jeff Olson 2013-07-19 16:22:13 -07:00
parent 5da29e3278
commit 155470fc9c
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstd/rt/io/mod.rs
View file

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

8
src/libstd/rt/io/timer.rs
View file

@ -17,11 +17,11 @@ 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>();
@ -29,7 +29,7 @@ impl 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)