---

yaml
---
r: 64116
b: refs/heads/snap-stage3
c: 59083d2
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: af453a33cc4ec8773ce869c4564d713a7ba60775
+refs/heads/snap-stage3: 59083d2c6aedcbab469e263850c717cd958c24e6
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/ptr.rs

@@ -143,7 +143,7 @@ pub unsafe fn set_memory<T>(dst: *mut T, c: u8, count: uint) {
 }
 
 /**
- * Zeroes out `count` bytes of memory at `dst`
+ * Zeroes out `count * size_of::<T>` bytes of memory at `dst`
  */
 #[inline]
 #[cfg(not(stage0))]

branches/snap-stage3/src/rt/boxed_region.cpp

@@ -39,10 +39,6 @@ rust_opaque_box *boxed_region::malloc(type_desc *td, size_t body_size) {
 rust_opaque_box *boxed_region::realloc(rust_opaque_box *box,
                                        size_t new_size) {
 
-    // We also get called on the unique-vec-in-managed-heap path.
-    // assert(box->ref_count == 1 ||
-    //        box->ref_count == (size_t)(-2));
-
     size_t total_size = new_size + sizeof(rust_opaque_box);
     rust_opaque_box *new_box =
         (rust_opaque_box*)backing_region->realloc(box, total_size);

branches/snap-stage3/src/test/run-pass/borrowck-wg-autoderef-and-autoborrowvec-combined-issue-6272.rs

@@ -29,13 +29,13 @@
 
 fn main() {
     let a = @mut 3i;
-    // let b = @mut [a];
-    // let c = @mut [3];
+    let b = @mut [a];
+    let c = @mut [3];
 
     // this should freeze `a` only
     let _x: &mut int = a;
 
     // hence these writes should not fail:
-    // b[0] = b[0];
-    // c[0] = c[0];
+    b[0] = b[0];
+    c[0] = c[0];
 }