From 9e1c9be16f9140e09f26de947fddf806c27a957f Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Wed, 28 Nov 2012 15:42:16 -0800
Subject: librustc: Make the Drop trait use explicit self

---
 src/libstd/arc.rs     |  2 +-
 src/libstd/arena.rs   |  2 +-
 src/libstd/c_vec.rs   | 10 +++++-----
 src/libstd/future.rs  |  2 +-
 src/libstd/net_tcp.rs |  8 ++++----
 src/libstd/sort.rs    |  2 +-
 src/libstd/sync.rs    | 18 +++++++++---------
 7 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/libstd')

diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs
index 628d72f99c1..3ced56e6f50 100644
--- a/src/libstd/arc.rs
+++ b/src/libstd/arc.rs
@@ -229,7 +229,7 @@ struct PoisonOnFail {
 }
 
 impl PoisonOnFail : Drop {
-    fn finalize() {
+    fn finalize(&self) {
         /* assert !*self.failed; -- might be false in case of cond.wait() */
         if task::failing() { *self.failed = true; }
     }
diff --git a/src/libstd/arena.rs b/src/libstd/arena.rs
index cf8bbc628f0..ea247d4bd3f 100644
--- a/src/libstd/arena.rs
+++ b/src/libstd/arena.rs
@@ -58,7 +58,7 @@ pub struct Arena {
 }
 
 impl Arena : Drop {
-    fn finalize() {
+    fn finalize(&self) {
         unsafe {
             destroy_chunk(&self.head);
             for list::each(self.chunks) |chunk| {
diff --git a/src/libstd/c_vec.rs b/src/libstd/c_vec.rs
index 2e94f07d2d8..8777592eacc 100644
--- a/src/libstd/c_vec.rs
+++ b/src/libstd/c_vec.rs
@@ -42,11 +42,11 @@ struct DtorRes {
 }
 
 impl DtorRes : Drop {
-    fn finalize() {
-    match self.dtor {
-      option::None => (),
-      option::Some(f) => f()
-    }
+    fn finalize(&self) {
+        match self.dtor {
+          option::None => (),
+          option::Some(f) => f()
+        }
     }
 }
 
diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index 31144740c8a..a22e4d67468 100644
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -28,7 +28,7 @@ pub struct Future<A> {
 // FIXME(#2829) -- futures should not be copyable, because they close
 // over fn~'s that have pipes and so forth within!
 impl<A> Future<A> : Drop {
-    fn finalize() {}
+    fn finalize(&self) {}
 }
 
 priv enum FutureState<A> {
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index 182ec2a233c..2dd0c2b286d 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -30,10 +30,10 @@ struct TcpSocket {
 }
 
 impl TcpSocket : Drop {
-    fn finalize() {
-    unsafe {
-        tear_down_socket_data(self.socket_data)
-    }
+    fn finalize(&self) {
+        unsafe {
+            tear_down_socket_data(self.socket_data)
+        }
     }
 }
 
diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs
index c6e8c72e6d6..c9981c2fef5 100644
--- a/src/libstd/sort.rs
+++ b/src/libstd/sort.rs
@@ -1137,7 +1137,7 @@ mod big_tests {
     }
 
     impl LVal : Drop {
-        fn finalize() {
+        fn finalize(&self) {
             let x = unsafe { task::local_data::local_data_get(self.key) };
             match x {
                 Some(@y) => {
diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs
index c288e4dc4d3..61201d44d2f 100644
--- a/src/libstd/sync.rs
+++ b/src/libstd/sync.rs
@@ -153,7 +153,7 @@ struct SemRelease {
 }
 
 impl SemRelease : Drop {
-    fn finalize() {
+    fn finalize(&self) {
         self.sem.release();
     }
 }
@@ -170,7 +170,7 @@ struct SemAndSignalRelease {
 }
 
 impl SemAndSignalRelease : Drop {
-    fn finalize() {
+    fn finalize(&self) {
         self.sem.release();
     }
 }
@@ -185,7 +185,7 @@ fn SemAndSignalRelease(sem: &r/Sem<~[mut Waitqueue]>)
 /// A mechanism for atomic-unlock-and-deschedule blocking and signalling.
 pub struct Condvar { priv sem: &Sem<~[mut Waitqueue]> }
 
-impl Condvar : Drop { fn finalize() {} }
+impl Condvar : Drop { fn finalize(&self) {} }
 
 impl &Condvar {
     /**
@@ -257,7 +257,7 @@ impl &Condvar {
         }
 
         impl SemAndSignalReacquire : Drop {
-            fn finalize() {
+            fn finalize(&self) {
                 unsafe {
                     // Needs to succeed, instead of itself dying.
                     do task::unkillable {
@@ -607,7 +607,7 @@ struct RWlockReleaseRead {
 }
 
 impl RWlockReleaseRead : Drop {
-    fn finalize() {
+    fn finalize(&self) {
         unsafe {
             do task::unkillable {
                 let mut last_reader = false;
@@ -641,7 +641,7 @@ struct RWlockReleaseDowngrade {
 }
 
 impl RWlockReleaseDowngrade : Drop {
-    fn finalize() {
+    fn finalize(&self) {
         unsafe {
             do task::unkillable {
                 let mut writer_or_last_reader = false;
@@ -678,10 +678,10 @@ fn RWlockReleaseDowngrade(lock: &r/RWlock) -> RWlockReleaseDowngrade/&r {
 
 /// The "write permission" token used for rwlock.write_downgrade().
 pub struct RWlockWriteMode { /* priv */ lock: &RWlock }
-impl RWlockWriteMode : Drop { fn finalize() {} }
+impl RWlockWriteMode : Drop { fn finalize(&self) {} }
 /// The "read permission" token used for rwlock.write_downgrade().
 pub struct RWlockReadMode  { priv lock: &RWlock }
-impl RWlockReadMode : Drop { fn finalize() {} }
+impl RWlockReadMode : Drop { fn finalize(&self) {} }
 
 impl &RWlockWriteMode {
     /// Access the pre-downgrade rwlock in write mode.
@@ -993,7 +993,7 @@ mod tests {
         }
 
         impl SendOnFailure : Drop {
-            fn finalize() {
+            fn finalize(&self) {
                 self.c.send(());
             }
         }
-- 
cgit 1.4.1-3-g733a5