diff options
| author | bors <bors@rust-lang.org> | 2013-07-27 01:49:35 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-27 01:49:35 -0700 |
| commit | 15310ba7c2a930a26bf6104f336cf7220eec7dc7 (patch) | |
| tree | e85d3a47641c3a9f00364996647626f882501c1b /src/libstd/rt/uv/timer.rs | |
| parent | c5194740a78ec113cb6cbc937e7263e2548f62f6 (diff) | |
| parent | df67942dccc33379051e66f075615e579f3bdb49 (diff) | |
auto merge of #8040 : luqmana/rust/rtn, r=brson
Implements various missing tcp & udp methods.. Also fixes handling ipv4-mapped/compatible ipv6 addresses and addresses the XXX on `status_to_maybe_uv_error`. r? @brson
Diffstat (limited to 'src/libstd/rt/uv/timer.rs')
| -rw-r--r-- | src/libstd/rt/uv/timer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/rt/uv/timer.rs b/src/libstd/rt/uv/timer.rs index bc5399327a0..eaa5e77a6da 100644 --- a/src/libstd/rt/uv/timer.rs +++ b/src/libstd/rt/uv/timer.rs @@ -43,7 +43,7 @@ impl TimerWatcher { let mut watcher: TimerWatcher = NativeHandle::from_native_handle(handle); let data = watcher.get_watcher_data(); let cb = data.timer_cb.get_ref(); - let status = status_to_maybe_uv_error(handle, status); + let status = status_to_maybe_uv_error(watcher, status); (*cb)(watcher, status); } } |