---

yaml
---
r: 93823
b: refs/heads/try
c: bb39cc3
h: refs/heads/master
i:
  93821: a615362
  93819: d57704a
  93815: 00f7bae
  93807: 9163ef8
  93791: f1e1257
  93759: 7b39f12
  93695: 8480120
v: v3

Author: sfackler

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 2e4bb2b9e9e10a665e23a34ae60652a90e9a1b82
+refs/heads/try: bb39cc3ae6db7effb17902d0cff0a737aef15101
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/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 {