---

yaml
---
r: 41820
b: refs/heads/master
c: b72ed55
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a8ff9f2ef9fd29ef937d2d2955c2ad8ee3b4b305
+refs/heads/master: b72ed5572f585cfc1771117739447f2f6dfa6785
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/libcore/gc.rs

@@ -347,6 +347,7 @@ pub fn cleanup_stack_for_failure() {
 
             if ptr::is_null(tydesc) {
                 // FIXME #4420: Destroy this box
+                // FIXME #4330: Destroy this box
             } else {
                 rustrt::rust_call_tydesc_glue(*root, tydesc, 3 as size_t);
             }

trunk/src/libcore/pipes.rs

@@ -206,14 +206,17 @@ pub type Packet<T: Owned> = {
 
 #[doc(hidden)]
 pub trait HasBuffer {
-    // FIXME #4421: This should not have a trailing underscore
+    fn set_buffer(b: *libc::c_void);
+    // FIXME #4421 remove after snapshot
     fn set_buffer_(b: *libc::c_void);
 }
 
 impl<T: Owned> Packet<T>: HasBuffer {
-    fn set_buffer_(b: *libc::c_void) {
+    fn set_buffer(b: *libc::c_void) {
         self.header.buffer = b;
     }
+    // FIXME #4421 remove after snapshot
+    fn set_buffer_(b: *libc::c_void) { self.set_buffer(b) }
 }
 
 #[doc(hidden)]