---

yaml
---
r: 146775
b: refs/heads/try2
c: bb39cc3
h: refs/heads/master
i:
  146773: 2b26ab0
  146771: a9f1d5a
  146767: 75bb624
v: v3

Author: sfackler

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 2e4bb2b9e9e10a665e23a34ae60652a90e9a1b82
+refs/heads/try2: bb39cc3ae6db7effb17902d0cff0a737aef15101
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/mutable.rs

@@ -82,30 +82,30 @@ impl<T> Mut<T> {
 
     /// Mutably borrows the wrapped value.
     ///
-    /// The borrow lasts untile the returned `MutRef` exits scope. The value
+    /// The borrow lasts untile the returned `RefMut` exits scope. The value
     /// cannot be borrowed while this borrow is active.
     ///
     /// Returns `None` if the value is currently borrowed.
-    pub fn try_borrow_mut<'a>(&'a self) -> Option<MutRef<'a, T>> {
+    pub fn try_borrow_mut<'a>(&'a self) -> Option<RefMut<'a, T>> {
         match self.borrow {
             UNUSED => unsafe {
                 let mut_self = self.as_mut();
                 mut_self.borrow = WRITING;
-                Some(MutRef { parent: mut_self })
+                Some(RefMut { parent: mut_self })
             },
             _ => None
         }
     }
 
     /// Mutably borrows the wrapped value.
     ///
-    /// The borrow lasts untile the returned `MutRef` exits scope. The value
+    /// The borrow lasts untile the returned `RefMut` exits scope. The value
     /// cannot be borrowed while this borrow is active.
     ///
     /// # Failure
     ///
     /// Fails if the value is currently borrowed.
-    pub fn borrow_mut<'a>(&'a self) -> MutRef<'a, T> {
+    pub fn borrow_mut<'a>(&'a self) -> RefMut<'a, T> {
         match self.try_borrow_mut() {
             Some(ptr) => ptr,
             None => fail!("Mut<T> already borrowed")
@@ -179,19 +179,19 @@ impl<'box, T> Ref<'box, T> {
 }
 
 /// Wraps a mutable borrowed reference to a value in a `Mut` box.
-pub struct MutRef<'box, T> {
+pub struct RefMut<'box, T> {
     priv parent: &'box mut Mut<T>
 }
 
 #[unsafe_destructor]
-impl<'box, T> Drop for MutRef<'box, T> {
+impl<'box, T> Drop for RefMut<'box, T> {
     fn drop(&mut self) {
         assert!(self.parent.borrow == WRITING);
-        unsafe { self.parent.as_mut().borrow = UNUSED; }
+        self.parent.borrow = UNUSED;
     }
 }
 
-impl<'box, T> MutRef<'box, T> {
+impl<'box, T> RefMut<'box, T> {
     /// Retrieve a mutable reference to the stored value.
     #[inline]
     pub fn get<'a>(&'a mut self) -> &'a mut T {