diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-09-16 21:18:07 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-09-16 22:19:23 -0400 |
| commit | 4e161a4d401224507513bfbf33b22f0b72f8ba81 (patch) | |
| tree | 59cd25a1d2132de130ddacc5ca2d25d39a511195 /src/libstd/rt | |
| parent | bc89ade401e637fcb7d4d1d0b7f356ca359b0e7d (diff) | |
| download | rust-4e161a4d401224507513bfbf33b22f0b72f8ba81.tar.gz rust-4e161a4d401224507513bfbf33b22f0b72f8ba81.zip | |
switch Drop to `&mut self`
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/comm.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rt/kill.rs | 4 | ||||
| -rw-r--r-- | src/libstd/rt/local_heap.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/rc.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/sched.rs | 6 | ||||
| -rw-r--r-- | src/libstd/rt/stack.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/task.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/thread.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/uv/uvio.rs | 14 |
9 files changed, 19 insertions, 19 deletions
diff --git a/src/libstd/rt/comm.rs b/src/libstd/rt/comm.rs index 4f5f26513b4..a8cd9bd66d7 100644 --- a/src/libstd/rt/comm.rs +++ b/src/libstd/rt/comm.rs @@ -363,7 +363,7 @@ impl<T> Peekable<T> for PortOne<T> { #[unsafe_destructor] impl<T> Drop for ChanOne<T> { - fn drop(&self) { + fn drop(&mut self) { if self.suppress_finalize { return } unsafe { @@ -391,7 +391,7 @@ impl<T> Drop for ChanOne<T> { #[unsafe_destructor] impl<T> Drop for PortOne<T> { - fn drop(&self) { + fn drop(&mut self) { if self.suppress_finalize { return } unsafe { diff --git a/src/libstd/rt/kill.rs b/src/libstd/rt/kill.rs index e6003fb1a44..92dc62490ed 100644 --- a/src/libstd/rt/kill.rs +++ b/src/libstd/rt/kill.rs @@ -235,7 +235,7 @@ pub struct Death { impl Drop for KillFlag { // Letting a KillFlag with a task inside get dropped would leak the task. // We could free it here, but the task should get awoken by hand somehow. - fn drop(&self) { + fn drop(&mut self) { match self.load(Relaxed) { KILL_RUNNING | KILL_KILLED => { }, _ => rtabort!("can't drop kill flag with a blocked task inside!"), @@ -685,7 +685,7 @@ impl Death { } impl Drop for Death { - fn drop(&self) { + fn drop(&mut self) { // Mustn't be in an atomic or unkillable section at task death. rtassert!(self.unkillable == 0); rtassert!(self.wont_sleep == 0); diff --git a/src/libstd/rt/local_heap.rs b/src/libstd/rt/local_heap.rs index 12ec19a1ecc..9d0a0e0ac25 100644 --- a/src/libstd/rt/local_heap.rs +++ b/src/libstd/rt/local_heap.rs @@ -78,7 +78,7 @@ impl LocalHeap { impl Drop for LocalHeap { #[fixed_stack_segment] #[inline(never)] - fn drop(&self) { + fn drop(&mut self) { unsafe { rust_delete_boxed_region(self.boxed_region); rust_delete_memory_region(self.memory_region); diff --git a/src/libstd/rt/rc.rs b/src/libstd/rt/rc.rs index 18a5dd4a114..0a6890f627b 100644 --- a/src/libstd/rt/rc.rs +++ b/src/libstd/rt/rc.rs @@ -74,7 +74,7 @@ impl<T> RC<T> { #[unsafe_destructor] impl<T> Drop for RC<T> { - fn drop(&self) { + fn drop(&mut self) { assert!(self.refcount() > 0); unsafe { diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs index bcf9ae4a2a8..854fdadfb00 100644 --- a/src/libstd/rt/sched.rs +++ b/src/libstd/rt/sched.rs @@ -1200,15 +1200,15 @@ mod test { struct S { field: () } impl Drop for S { - fn drop(&self) { - let _foo = @0; + fn drop(&mut self) { + let _foo = @0; } } let s = S { field: () }; do spawntask { - let _ss = &s; + let _ss = &s; } } } diff --git a/src/libstd/rt/stack.rs b/src/libstd/rt/stack.rs index da70659acec..fddee5882b9 100644 --- a/src/libstd/rt/stack.rs +++ b/src/libstd/rt/stack.rs @@ -53,7 +53,7 @@ impl StackSegment { } impl Drop for StackSegment { - fn drop(&self) { + fn drop(&mut self) { #[fixed_stack_segment]; #[inline(never)]; unsafe { diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index da81aab0f78..09f5ee7febb 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -328,7 +328,7 @@ impl Task { } impl Drop for Task { - fn drop(&self) { + fn drop(&mut self) { rtdebug!("called drop for a task: %u", borrow::to_uint(self)); rtassert!(self.destroyed) } diff --git a/src/libstd/rt/thread.rs b/src/libstd/rt/thread.rs index 61db08f4813..8b64fda2136 100644 --- a/src/libstd/rt/thread.rs +++ b/src/libstd/rt/thread.rs @@ -46,7 +46,7 @@ impl Thread { } impl Drop for Thread { - fn drop(&self) { + fn drop(&mut self) { #[fixed_stack_segment]; #[inline(never)]; assert!(self.joined); diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs index b930ea2437e..f3b97441e8e 100644 --- a/src/libstd/rt/uv/uvio.rs +++ b/src/libstd/rt/uv/uvio.rs @@ -187,7 +187,7 @@ impl UvEventLoop { } impl Drop for UvEventLoop { - fn drop(&self) { + fn drop(&mut self) { // XXX: Need mutable finalizer let this = unsafe { transmute::<&UvEventLoop, &mut UvEventLoop>(self) @@ -351,7 +351,7 @@ impl RemoteCallback for UvRemoteCallback { } impl Drop for UvRemoteCallback { - fn drop(&self) { + fn drop(&mut self) { unsafe { let this: &mut UvRemoteCallback = cast::transmute_mut(self); do this.exit_flag.with |should_exit| { @@ -647,7 +647,7 @@ impl UvTcpListener { } impl Drop for UvTcpListener { - fn drop(&self) { + 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| { @@ -762,7 +762,7 @@ impl HomingIO for UvTcpStream { } impl Drop for UvTcpStream { - fn drop(&self) { + 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| { @@ -921,7 +921,7 @@ impl HomingIO for UvUdpSocket { } impl Drop for UvUdpSocket { - fn drop(&self) { + 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| { @@ -1139,7 +1139,7 @@ impl UvTimer { } impl Drop for UvTimer { - fn drop(&self) { + fn drop(&mut self) { let self_ = unsafe { transmute::<&UvTimer, &mut UvTimer>(self) }; do self_.home_for_io_with_sched |self_, scheduler| { rtdebug!("closing UvTimer"); @@ -1253,7 +1253,7 @@ impl UvFileStream { } impl Drop for UvFileStream { - fn drop(&self) { + fn drop(&mut self) { let self_ = unsafe { transmute::<&UvFileStream, &mut UvFileStream>(self) }; if self.close_on_drop { do self_.home_for_io_with_sched |self_, scheduler| { |
