diff options
| author | bors <bors@rust-lang.org> | 2013-09-17 12:50:46 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-17 12:50:46 -0700 |
| commit | 9e8fb4ad61cfe97413eb92d764aa6aeeb23d5afa (patch) | |
| tree | 7528ed6b4d16d1eeb51e5f181eb24fa1a32ceff3 /src/libstd/rt/uv | |
| parent | 023aab453c53fdeee8a99da2766ba562b224785c (diff) | |
| parent | befc561fa4f76b058fc4d9d14f7ed508df0cb272 (diff) | |
| download | rust-9e8fb4ad61cfe97413eb92d764aa6aeeb23d5afa.tar.gz rust-9e8fb4ad61cfe97413eb92d764aa6aeeb23d5afa.zip | |
auto merge of #9256 : thestinger/rust/drop, r=alexcrichton
Diffstat (limited to 'src/libstd/rt/uv')
| -rw-r--r-- | src/libstd/rt/uv/uvio.rs | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs index f3b97441e8e..8c827430f25 100644 --- a/src/libstd/rt/uv/uvio.rs +++ b/src/libstd/rt/uv/uvio.rs @@ -188,11 +188,7 @@ impl UvEventLoop { impl Drop for UvEventLoop { fn drop(&mut self) { - // XXX: Need mutable finalizer - let this = unsafe { - transmute::<&UvEventLoop, &mut UvEventLoop>(self) - }; - this.uvio.uv_loop().close(); + self.uvio.uv_loop().close(); } } @@ -648,9 +644,7 @@ impl UvTcpListener { impl Drop for UvTcpListener { fn drop(&mut self) { - // XXX need mutable finalizer - let self_ = unsafe { transmute::<&UvTcpListener, &mut UvTcpListener>(self) }; - do self_.home_for_io_with_sched |self_, scheduler| { + do self.home_for_io_with_sched |self_, scheduler| { do scheduler.deschedule_running_task_and_then |_, task| { let task = Cell::new(task); do self_.watcher.as_stream().close { @@ -763,9 +757,7 @@ impl HomingIO for UvTcpStream { impl Drop for UvTcpStream { fn drop(&mut self) { - // XXX need mutable finalizer - let this = unsafe { transmute::<&UvTcpStream, &mut UvTcpStream>(self) }; - do this.home_for_io_with_sched |self_, scheduler| { + do self.home_for_io_with_sched |self_, scheduler| { do scheduler.deschedule_running_task_and_then |_, task| { let task_cell = Cell::new(task); do self_.watcher.as_stream().close { @@ -922,9 +914,7 @@ impl HomingIO for UvUdpSocket { impl Drop for UvUdpSocket { fn drop(&mut self) { - // XXX need mutable finalizer - let this = unsafe { transmute::<&UvUdpSocket, &mut UvUdpSocket>(self) }; - do this.home_for_io_with_sched |self_, scheduler| { + do self.home_for_io_with_sched |self_, scheduler| { do scheduler.deschedule_running_task_and_then |_, task| { let task_cell = Cell::new(task); do self_.watcher.close { |