File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -298,7 +298,7 @@ mod extensions;
298
298
mod support;
299
299
300
300
/// Basic Timer
301
- mod timer;
301
+ pub mod timer;
302
302
303
303
/// Thread-blocking implementations
304
304
pub mod native {
Original file line number Diff line number Diff line change @@ -17,19 +17,19 @@ use rt::local::Local;
17
17
pub struct Timer ( ~RtioTimerObject ) ;
18
18
19
19
impl Timer {
20
- fn new ( i : ~RtioTimerObject ) -> Timer {
20
+ fn new_on_rt ( i : ~RtioTimerObject ) -> Timer {
21
21
Timer ( i)
22
22
}
23
23
24
- pub fn init ( ) -> Option < Timer > {
24
+ pub fn new ( ) -> Option < Timer > {
25
25
let timer = unsafe {
26
26
rtdebug ! ( "Timer::init: borrowing io to init timer" ) ;
27
27
let io = Local :: unsafe_borrow :: < IoFactoryObject > ( ) ;
28
28
rtdebug ! ( "about to init timer" ) ;
29
29
( * io) . timer_init ( )
30
30
} ;
31
31
match timer {
32
- Ok ( t) => Some ( Timer :: new ( t) ) ,
32
+ Ok ( t) => Some ( Timer :: new_on_rt ( t) ) ,
33
33
Err ( ioerr) => {
34
34
rtdebug ! ( "Timer::init: failed to init: %?" , ioerr) ;
35
35
io_error:: cond. raise ( ioerr) ;
@@ -53,7 +53,7 @@ mod test {
53
53
#[ test]
54
54
fn test_io_timer_sleep_simple ( ) {
55
55
do run_in_newsched_task {
56
- let timer = Timer :: init ( ) ;
56
+ let timer = Timer :: new ( ) ;
57
57
match timer {
58
58
Some ( t) => t. sleep ( 1 ) ,
59
59
None => assert ! ( false )
You can’t perform that action at this time.
0 commit comments