---

yaml
---
r: 38955
b: refs/heads/incoming
c: f4a5a76
h: refs/heads/master
i:
  38953: 45e960d
  38951: 4c2d753
v: v3

Author: bstrie

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 6e650f2d2c83a191a0546b394a87ba348934db4f
+refs/heads/incoming: f4a5a76aa4596b3892dced83e3e2bea082e20c48
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/auxiliary/issue-2526.rs

@@ -9,7 +9,10 @@ export context;
 
 struct arc_destruct<T:Const> {
   _data: int,
-  drop {}
+}
+
+impl<T:Const> arc_destruct<T> : Drop {
+    fn finalize() {}
 }
 
 fn arc_destruct<T: Const>(data: int) -> arc_destruct<T> {
@@ -28,8 +31,10 @@ fn init() -> arc_destruct<context_res> unsafe {
 
 struct context_res {
     ctx : int,
+}
 
-    drop { }
+impl context_res : Drop {
+    fn finalize() {}
 }
 
 fn context_res() -> context_res {

branches/incoming/src/test/auxiliary/issue-3012-1.rs

@@ -9,7 +9,12 @@ export socket_handle;
 
 struct socket_handle {
     sockfd: libc::c_int,
-    drop { /* c::close(self.sockfd); */ }
+}
+
+impl socket_handle : Drop {
+    fn finalize() {
+        /* c::close(self.sockfd); */
+    }
 }
 
     fn socket_handle(x: libc::c_int) -> socket_handle {

branches/incoming/src/test/auxiliary/issue2170lib.rs

@@ -5,11 +5,16 @@ fn foo(_x: i32) {
 
 struct rsrc {
   x: i32,
-  drop { foo(self.x); }
+}
+
+impl rsrc : Drop {
+    fn finalize() {
+        foo(self.x);
+    }
 }
 
 fn rsrc(x: i32) -> rsrc {
     rsrc {
         x: x
     }
-}
+}

branches/incoming/src/test/auxiliary/test_comm.rs

@@ -29,23 +29,28 @@ fn port<T: Send>() -> port<T> {
 
 struct port_ptr<T:Send> {
    po: *rust_port,
-   drop unsafe {
-    debug!("in the port_ptr destructor");
-       do task::unkillable {
-        let yield = 0u;
-        let yieldp = ptr::addr_of(&yield);
-        rustrt::rust_port_begin_detach(self.po, yieldp);
-        if yield != 0u {
-            task::yield();
-        }
-        rustrt::rust_port_end_detach(self.po);
+}
 
-        while rustrt::rust_port_size(self.po) > 0u as size_t {
-            recv_::<T>(self.po);
+impl<T:Send> port_ptr<T> : Drop {
+    fn finalize() {
+        unsafe {
+            debug!("in the port_ptr destructor");
+               do task::unkillable {
+                let yield = 0u;
+                let yieldp = ptr::addr_of(&yield);
+                rustrt::rust_port_begin_detach(self.po, yieldp);
+                if yield != 0u {
+                    task::yield();
+                }
+                rustrt::rust_port_end_detach(self.po);
+
+                while rustrt::rust_port_size(self.po) > 0u as size_t {
+                    recv_::<T>(self.po);
+                }
+                rustrt::del_port(self.po);
+            }
         }
-        rustrt::del_port(self.po);
     }
-  }
 }
 
 fn port_ptr<T: Send>(po: *rust_port) -> port_ptr<T> {

branches/incoming/src/test/bench/task-perf-alloc-unwind.rs

@@ -42,7 +42,10 @@ enum st {
 
 struct r {
   _l: @nillist,
-  drop {}
+}
+
+impl r : Drop {
+    fn finalize() {}
 }
 
 fn r(l: @nillist) -> r {

branches/incoming/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-1.rs

@@ -1,4 +1,10 @@
-struct X { x: (), drop { error!("destructor runs"); } }
+struct X { x: () }
+
+impl X : Drop {
+    fn finalize() {
+        error!("destructor runs");
+    }
+}
 
 fn main() {
     let x = Some(X { x: () });

branches/incoming/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-2.rs

@@ -1,4 +1,10 @@
-struct X { x: (), drop { error!("destructor runs"); } }
+struct X { x: (), }
+
+impl X : Drop {
+    fn finalize() {
+        error!("destructor runs");
+    }
+}
 
 fn main() {
     let x = Some((X { x: () }, X { x: () }));

branches/incoming/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-3.rs

@@ -1,4 +1,10 @@
-struct X { x: (), drop { error!("destructor runs"); } }
+struct X { x: (), }
+
+impl X : Drop {
+    fn finalize() {
+        error!("destructor runs");
+    }
+}
 
 enum double_option<T,U> { some2(T,U), none2 }
 

branches/incoming/src/test/compile-fail/bind-by-move-neither-can-live-while-the-other-survives-4.rs

@@ -1,4 +1,10 @@
-struct X { x: (), drop { error!("destructor runs"); } }
+struct X { x: (), }
+
+impl X : Drop {
+    fn finalize() {
+        error!("destructor runs");
+    }
+}
 
 fn main() {
     let x = Some((X { x: () }, X { x: () }));

branches/incoming/src/test/compile-fail/bind-by-move-no-lvalues-1.rs

@@ -1,4 +1,10 @@
-struct X { x: (), drop { error!("destructor runs"); } }
+struct X { x: (), }
+
+impl X : Drop {
+    fn finalize() {
+        error!("destructor runs");
+    }
+}
 
 fn main() {
     let x = Some(X { x: () });

branches/incoming/src/test/compile-fail/bind-by-move-no-lvalues-2.rs

@@ -1,4 +1,11 @@
-struct X { x: (), drop { error!("destructor runs"); } }
+struct X { x: (), }
+
+impl X : Drop {
+    fn finalize() {
+        error!("destructor runs");
+    }
+}
+
 struct Y { y: Option<X> }
 
 fn main() {

branches/incoming/src/test/compile-fail/bind-by-move-no-sub-bindings.rs

@@ -1,4 +1,10 @@
-struct X { x: (), drop { error!("destructor runs"); } }
+struct X { x: (), }
+
+impl X : Drop {
+    fn finalize() {
+        error!("destructor runs");
+    }
+}
 
 fn main() {
     let x = Some(X { x: () });

branches/incoming/src/test/compile-fail/block-must-not-have-result-res.rs

@@ -1,8 +1,12 @@
 // error-pattern:mismatched types: expected `()` but found `bool`
 
-struct r {
-  drop { true }
+struct r {}
+
+impl r : Drop {
+    fn finalize() {
+        true
+    }
 }
 
 fn main() {
-}
+}

branches/incoming/src/test/compile-fail/borrowck-borrowed-uniq-rvalue-2.rs

@@ -1,6 +1,11 @@
 struct defer {
     x: &[&str],
-    drop { error!("%?", self.x); }
+}
+
+impl defer : Drop {
+    fn finalize() {
+        error!("%?", self.x);
+    }
 }
 
 fn defer(x: &r/[&r/str]) -> defer/&r {

branches/incoming/src/test/compile-fail/borrowck-unary-move-2.rs

@@ -1,5 +1,11 @@
 struct noncopyable {
-    i: (), drop { error!("dropped"); }
+    i: (),
+}
+
+impl noncopyable : Drop {
+    fn finalize() {
+        error!("dropped");
+    }
 }
 
 fn noncopyable() -> noncopyable {

branches/incoming/src/test/compile-fail/cap-clause-illegal-cap.rs

@@ -1,6 +1,10 @@
 // error-pattern: copying a noncopyable value
 
-struct foo { x: int, drop { } }
+struct foo { x: int, }
+
+impl foo : Drop {
+    fn finalize() {}
+}
 
 fn foo(x: int) -> foo {
     foo {

branches/incoming/src/test/compile-fail/copy-a-resource.rs

@@ -2,7 +2,10 @@
 
 struct foo {
   i: int,
-  drop {}
+}
+
+impl foo : Drop {
+    fn finalize() {}
 }
 
 fn foo(i:int) -> foo {

branches/incoming/src/test/compile-fail/disallowed-deconstructing-destructing-struct.rs

@@ -1,6 +1,9 @@
 struct X {
     x: ~str,
-    drop {
+}
+
+impl X : Drop {
+    fn finalize() {
         error!("value: %s", self.x);
     }
 }

branches/incoming/src/test/compile-fail/functional-struct-update.rs

@@ -1,6 +1,11 @@
 struct Bar {
     x: int,
-    drop { io::println("Goodbye, cruel world"); }
+}
+
+impl Bar : Drop {
+    fn finalize() {
+        io::println("Goodbye, cruel world");
+    }
 }
 
 struct Foo {

branches/incoming/src/test/compile-fail/issue-2487-b.rs

@@ -1,7 +1,9 @@
 struct socket {
     sock: int,
+}
 
-    drop { }
+impl socket : Drop {
+    fn finalize() {}
 }
 
 impl socket {

branches/incoming/src/test/compile-fail/issue-2548.rs

@@ -4,7 +4,10 @@ struct foo {
     x: @mut int,
 
 
-    drop {
+}
+
+impl foo : Drop {
+    fn finalize() {
         io::println("Goodbye, World!");
         *self.x += 1;
     }

branches/incoming/src/test/compile-fail/issue-2587-2.rs

@@ -11,7 +11,10 @@ fn bar<T>(+_t: T) { fail; }
 
 struct S {
     x: int,
-    drop {}
+}
+
+impl S : Drop {
+    fn finalize() {}
 }
 
 fn S(x: int) -> S { S { x: x } }

branches/incoming/src/test/compile-fail/issue-2823.rs

@@ -1,6 +1,9 @@
 struct C {
     x: int,
-    drop {
+}
+
+impl C : Drop {
+    fn finalize() {
         error!("dropping: %?", self.x);
     }
 }
@@ -9,4 +12,4 @@ fn main() {
     let c = C{ x: 2};
     let d = copy c; //~ ERROR copying a noncopyable value
     error!("%?", d.x);
-}
+}

branches/incoming/src/test/compile-fail/issue-2825-b.rs

@@ -2,7 +2,10 @@ fn foo<T>() {
     struct foo {
         mut x: T, //~ ERROR attempt to use a type argument out of scope
         //~^ ERROR use of undeclared type name
-        drop { }
+    }
+
+    impl<T> foo<T> : Drop {
+        fn finalize() {}
     }
 }
 fn main() { }

branches/incoming/src/test/compile-fail/issue-3214.rs

@@ -50,8 +50,12 @@ fn f4b() -> int {
 // leave this in here just to trigger compile-fail:
 struct r {
     x: (),
-    drop {}
 }
+
+impl r : Drop {
+    fn finalize() {}
+}
+
 fn main() {
     let x = r { x: () };
     fn@(move x) { copy x; }; //~ ERROR copying a noncopyable value