---

yaml
---
r: 83189
b: refs/heads/try
c: aa406c1
h: refs/heads/master
i:
  83187: a5492e5
v: v3

Author: ben0x539

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: 9e8fb4ad61cfe97413eb92d764aa6aeeb23d5afa
+refs/heads/try: aa406c151e7404029760e56338f9ebc92319a5d5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libextra/workcache.rs

@@ -198,6 +198,7 @@ impl Database {
     }
 }
 
+// FIXME #4330: use &mut self here
 #[unsafe_destructor]
 impl Drop for Database {
     fn drop(&mut self) {

branches/try/src/libstd/rt/rc.rs

@@ -78,14 +78,17 @@ impl<T> Drop for RC<T> {
         assert!(self.refcount() > 0);
 
         unsafe {
-            match *self.get_mut_state() {
+            // FIXME(#4330) Need self by value to get mutability.
+            let this: &mut RC<T> = cast::transmute_mut(self);
+
+            match *this.get_mut_state() {
                 (ref mut count, _) => {
                     *count = *count - 1
                 }
             }
 
-            if self.refcount() == 0 {
-                let _: ~(uint, T) = cast::transmute(self.p);
+            if this.refcount() == 0 {
+                let _: ~(uint, T) = cast::transmute(this.p);
             }
         }
     }

branches/try/src/libstd/rt/uv/uvio.rs

@@ -188,7 +188,11 @@ impl UvEventLoop {
 
 impl Drop for UvEventLoop {
     fn drop(&mut self) {
-        self.uvio.uv_loop().close();
+        // XXX: Need mutable finalizer
+        let this = unsafe {
+            transmute::<&UvEventLoop, &mut UvEventLoop>(self)
+        };
+        this.uvio.uv_loop().close();
     }
 }
 
@@ -644,7 +648,9 @@ impl UvTcpListener {
 
 impl Drop for UvTcpListener {
     fn drop(&mut self) {
-        do self.home_for_io_with_sched |self_, scheduler| {
+        // XXX need mutable finalizer
+        let self_ = unsafe { transmute::<&UvTcpListener, &mut UvTcpListener>(self) };
+        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 {
@@ -757,7 +763,9 @@ impl HomingIO for UvTcpStream {
 
 impl Drop for UvTcpStream {
     fn drop(&mut self) {
-        do self.home_for_io_with_sched |self_, scheduler| {
+        // XXX need mutable finalizer
+        let this = unsafe { transmute::<&UvTcpStream, &mut UvTcpStream>(self) };
+        do this.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 {
@@ -914,7 +922,9 @@ impl HomingIO for UvUdpSocket {
 
 impl Drop for UvUdpSocket {
     fn drop(&mut self) {
-        do self.home_for_io_with_sched |self_, scheduler| {
+        // XXX need mutable finalizer
+        let this = unsafe { transmute::<&UvUdpSocket, &mut UvUdpSocket>(self) };
+        do this.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 {

branches/try/src/libstd/unstable/atomics.rs

@@ -339,7 +339,13 @@ impl<T> AtomicOption<T> {
 #[unsafe_destructor]
 impl<T> Drop for AtomicOption<T> {
     fn drop(&mut self) {
-        let _ = self.take(SeqCst);
+        // This will ensure that the contained data is
+        // destroyed, unless it's null.
+        unsafe {
+            // FIXME(#4330) Need self by value to get mutability.
+            let this : &mut AtomicOption<T> = cast::transmute(self);
+            let _ = this.take(SeqCst);
+        }
     }
 }
 

branches/try/src/libsyntax/print/pp.rs

@@ -243,7 +243,7 @@ pub fn mk_printer(out: @io::Writer, linewidth: uint) -> @mut Printer {
  * the entire buffered window, but can't output anything until the size is >=
  * 0 (sizes are set to negative while they're pending calculation).
  *
- * So SCAN takeks input and buffers tokens and pending calculations, while
+ * So SCAN takes input and buffers tokens and pending calculations, while
  * PRINT gobbles up completed calculations and tokens from the buffer. The
  * theory is that the two can never get more than 3N tokens apart, because
  * once there's "obviously" too much data to fit on a line, in a size