Skip to content

Commit b2e0fe4

Browse files
committed
---
yaml --- r: 15996 b: refs/heads/try c: 8ec467d h: refs/heads/master v: v3
1 parent 397bad2 commit b2e0fe4

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 92e9e736fab57a169882897337cef344a48c0c2d
5+
refs/heads/try: 8ec467d521e6e39f80a0c74c049a5aa719a01dde
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libstd/timer.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ for *at least* that period of time.
2121
* ch - a channel of type T to send a `val` on
2222
* val - a value of type T to send over the provided `ch`
2323
"]
24-
fn delayed_send<T: send>(hl_loop: uv::hl::high_level_loop,
25-
msecs: uint, ch: comm::chan<T>, val: T) {
24+
fn delayed_send<T: copy send>(hl_loop: uv::hl::high_level_loop,
25+
msecs: uint, ch: comm::chan<T>, val: T) {
2626
task::spawn() {||
2727
unsafe {
2828
let timer_done_po = comm::port::<()>();
@@ -97,8 +97,9 @@ An `option<T>` representing the outcome of the call. If the call `recv`'d on
9797
the provided port in the allotted timeout period, then the result will be a
9898
`some(T)`. If not, then `none` will be returned.
9999
"]
100-
fn recv_timeout<T: send>(hl_loop: uv::hl::high_level_loop,
101-
msecs: uint, wait_po: comm::port<T>) -> option<T> {
100+
fn recv_timeout<T: copy send>(hl_loop: uv::hl::high_level_loop,
101+
msecs: uint,
102+
wait_po: comm::port<T>) -> option<T> {
102103
let timeout_po = comm::port::<()>();
103104
let timeout_ch = comm::chan(timeout_po);
104105
delayed_send(hl_loop, msecs, timeout_ch, ());

0 commit comments

Comments
 (0)