---

yaml
---
r: 116687
b: refs/heads/snap-stage3
c: 0a98a4e
h: refs/heads/master
i:
  116685: 99b8283
  116683: 248424a
  116679: 7a7d185
  116671: 9ee6fce
v: v3

Author: michaelwoerister

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: bee4e6adac17f87b1cdc26ab69f8c0f5d82575a3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 7c7f4b0e0baac739c12080dcbf83ed04c11e9a89
+refs/heads/snap-stage3: 0a98a4e422bd2d80ee7910b00c0286f1eefde9c5
 refs/heads/try: 009d898a9422ac04c1aa60c0e9aff3abc5fa4672
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/doc/guide-lifetimes.md

@@ -275,10 +275,8 @@ invalidate the pointer `owner_age`.
 
 # Borrowing and enums
 
-The previous example showed that the type system forbids any mutations
-of owned boxed values while they are being borrowed. In general, the type
-system also forbids borrowing a value as mutable if it is already being
-borrowed - either as a mutable reference or an immutable one. This restriction
+The previous example showed that the type system forbids any borrowing
+of owned boxes found in aliasable, mutable memory. This restriction
 prevents pointers from pointing into freed memory. There is one other
 case where the compiler must be very careful to ensure that pointers
 remain valid: pointers into the interior of an `enum`.

branches/snap-stage3/src/libcore/cell.rs

@@ -385,7 +385,6 @@ impl<'b, T> DerefMut<T> for RefMut<'b, T> {
 #[cfg(test)]
 mod test {
     use super::*;
-    use mem::drop;
 
     #[test]
     fn smoketest_cell() {
@@ -413,22 +412,6 @@ mod test {
         assert!(format!("{}", x).as_slice().contains(x.get()));
     }
 
-    #[test]
-    fn ref_and_refmut_have_sensible_show() {
-        use str::StrSlice;
-        use realstd::str::Str;
-
-        let refcell = RefCell::new("foo");
-
-        let refcell_refmut = refcell.borrow_mut();
-        assert!(format!("{}", refcell_refmut).as_slice().contains("foo"));
-        drop(refcell_refmut);
-
-        let refcell_ref = refcell.borrow();
-        assert!(format!("{}", refcell_ref).as_slice().contains("foo"));
-        drop(refcell_ref);
-    }
-
     #[test]
     fn double_imm_borrow() {
         let x = RefCell::new(0);

branches/snap-stage3/src/libcore/fmt/mod.rs

@@ -13,14 +13,13 @@
 #![allow(unused_variable)]
 
 use any;
-use cell::{Cell, Ref, RefMut};
+use cell::Cell;
 use char::Char;
 use collections::Collection;
 use iter::{Iterator, range};
 use kinds::Copy;
 use mem;
 use option::{Option, Some, None};
-use ops::Deref;
 use result::{Ok, Err};
 use result;
 use slice::{Vector, ImmutableVector};
@@ -841,17 +840,5 @@ impl<T: Copy + Show> Show for Cell<T> {
     }
 }
 
-impl<'b, T: Show> Show for Ref<'b, T> {
-    fn fmt(&self, f: &mut Formatter) -> Result {
-        (**self).fmt(f)
-    }
-}
-
-impl<'b, T: Show> Show for RefMut<'b, T> {
-    fn fmt(&self, f: &mut Formatter) -> Result {
-        (*(self.deref())).fmt(f)
-    }
-}
-
 // If you expected tests to be here, look instead at the run-pass/ifmt.rs test,
 // it's a lot easier than creating all of the rt::Piece structures here.