---

yaml
---
r: 150179
b: refs/heads/try2
c: 76f0b1a
h: refs/heads/master
i:
  150177: 8fe3e76
  150175: 67e9bc0
v: v3

Author: alexcrichton

[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: 6a7fd8cfa59506d70c43b93256c7eeeb79133ca5
+refs/heads/try2: 76f0b1ad1fb314199b6db61df753d6757dee3b77
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/auxiliary/cci_nested_lib.rs

@@ -24,7 +24,7 @@ pub struct alist<A,B> {
 
 pub fn alist_add<A:'static,B:'static>(lst: &alist<A,B>, k: A, v: B) {
     let mut data = lst.data.borrow_mut();
-    data.get().push(Entry{key:k, value:v});
+    (*data).push(Entry{key:k, value:v});
 }
 
 pub fn alist_get<A:Clone + 'static,
@@ -34,7 +34,7 @@ pub fn alist_get<A:Clone + 'static,
                  -> B {
     let eq_fn = lst.eq_fn;
     let data = lst.data.borrow();
-    for entry in data.get().iter() {
+    for entry in (*data).iter() {
         if eq_fn(entry.key.clone(), k.clone()) {
             return entry.value.clone();
         }

branches/try2/src/test/compile-fail/issue-7013.rs

@@ -42,5 +42,5 @@ fn main()
     let w = v.clone();
     let b = v.deref();
     let mut b = b.borrow_mut();
-    b.get().v.set(w.clone());
+    b.v.set(w.clone());
 }

branches/try2/src/test/compile-fail/mut-cant-alias.rs

@@ -13,6 +13,6 @@ use std::cell::RefCell;
 fn main() {
     let m = RefCell::new(0);
     let mut b = m.borrow_mut();
-    let b1 = b.get();
-    let b2 = b.get(); //~ ERROR cannot borrow
+    let b1 = &mut *b;
+    let b2 = &mut *b; //~ ERROR cannot borrow
 }

branches/try2/src/test/compile-fail/mut-ptr-cant-outlive-ref.rs

@@ -15,6 +15,6 @@ fn main() {
     let p;
     {
         let b = m.borrow();
-        p = b.get(); //~ ERROR `b` does not live long enough
+        p = &*b; //~ ERROR `b` does not live long enough
     }
 }

branches/try2/src/test/run-pass/format-ref-cell.rs

@@ -13,6 +13,6 @@ use std::cell::RefCell;
 pub fn main() {
     let name = RefCell::new("rust");
     let what = RefCell::new("rocks");
-    let msg = format!("{name:?} {:?}", what.borrow().get(), name=name.borrow().get());
+    let msg = format!("{name:?} {:?}", &*what.borrow(), name=&*name.borrow());
     assert_eq!(msg, ~"&\"rust\" &\"rocks\"");
 }

branches/try2/src/test/run-pass/trait-cast.rs

@@ -42,8 +42,8 @@ impl to_str for Tree {
     fn to_str_(&self) -> ~str {
         let Tree(t) = *self;
         let this = t.borrow();
-        let (l, r) = (this.get().left, this.get().right);
-        let val = &this.get().val;
+        let (l, r) = (this.left, this.right);
+        let val = &this.val;
         format!("[{}, {}, {}]", val.to_str_(), l.to_str_(), r.to_str_())
     }
 }
@@ -64,6 +64,6 @@ pub fn main() {
     {
         let Tree(t1_) = t1;
         let mut t1 = t1_.borrow_mut();
-        t1.get().left = Some(t2); // create cycle
+        t1.left = Some(t2); // create cycle
     }
 }

branches/try2/src/test/run-pass/uniq-cc-generic.rs

@@ -38,6 +38,6 @@ pub fn main() {
     let v = empty_pointy();
     {
         let mut vb = v.borrow_mut();
-        vb.get().a = p(v);
+        vb.a = p(v);
     }
 }

branches/try2/src/test/run-pass/uniq-cc.rs

@@ -35,6 +35,6 @@ pub fn main() {
     let v = empty_pointy();
     {
         let mut vb = v.borrow_mut();
-        vb.get().a = p(v);
+        vb.a = p(v);
     }
 }