diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-08-20 12:23:37 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-08-26 15:56:16 -0700 |
| commit | 8337fa1a545e7958389c6025661990eedd9c1b91 (patch) | |
| tree | c8156400e412fe7e4441a42592f2687915d8f2fa /src/libstd/timer.rs | |
| parent | d9a6a6365327ac156ef3102e2b7efae1b2be5934 (diff) | |
| download | rust-8337fa1a545e7958389c6025661990eedd9c1b91.tar.gz rust-8337fa1a545e7958389c6025661990eedd9c1b91.zip | |
Camel case the option type
Diffstat (limited to 'src/libstd/timer.rs')
| -rw-r--r-- | src/libstd/timer.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs index 85547925c54..3c706bbddc6 100644 --- a/src/libstd/timer.rs +++ b/src/libstd/timer.rs @@ -104,7 +104,7 @@ fn sleep(iotask: iotask, msecs: uint) { */ fn recv_timeout<T: copy send>(iotask: iotask, msecs: uint, - wait_po: comm::Port<T>) -> option<T> { + wait_po: comm::Port<T>) -> Option<T> { let timeout_po = comm::port::<()>(); let timeout_ch = comm::chan(timeout_po); delayed_send(iotask, msecs, timeout_ch, ()); @@ -113,9 +113,9 @@ fn recv_timeout<T: copy send>(iotask: iotask, |left_val| { log(debug, fmt!("recv_time .. left_val %?", left_val)); - none + None }, |right_val| { - some(*right_val) + Some(*right_val) }, &core::comm::select2(timeout_po, wait_po) ) } @@ -249,7 +249,7 @@ mod test { }; match recv_timeout(hl_loop, 1u, test_po) { - none => successes += 1, + None => successes += 1, _ => failures += 1 }; } |
