---

yaml
---
r: 151086
b: refs/heads/try2
c: aff620d
h: refs/heads/master
v: v3

Author: flaper87

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

branches/try2/src/librustc/driver/driver.rs

@@ -348,8 +348,7 @@ pub fn phase_3_run_analysis_passes(sess: Session,
     time(time_passes, "effect checking", (), |_|
          middle::effect::check_crate(&ty_cx, krate));
 
-    let middle::moves::MoveMaps {moves_map, moved_variables_set,
-                                 capture_map} =
+    let middle::moves::MoveMaps {moves_map, capture_map} =
         time(time_passes, "compute moves", (), |_|
              middle::moves::compute_moves(&ty_cx, krate));
 
@@ -361,11 +360,9 @@ pub fn phase_3_run_analysis_passes(sess: Session,
 
     time(time_passes, "borrow checking", (), |_|
          middle::borrowck::check_crate(&ty_cx, &moves_map,
-                                       &moved_variables_set,
                                        &capture_map, krate));
 
     drop(moves_map);
-    drop(moved_variables_set);
 
     time(time_passes, "kind checking", (), |_|
          kind::check_crate(&ty_cx, krate));

branches/try2/src/librustc/middle/borrowck/mod.rs

@@ -77,13 +77,11 @@ impl<'a> Visitor<()> for BorrowckCtxt<'a> {
 
 pub fn check_crate(tcx: &ty::ctxt,
                    moves_map: &NodeSet,
-                   moved_variables_set: &NodeSet,
                    capture_map: &moves::CaptureMap,
                    krate: &ast::Crate) {
     let mut bccx = BorrowckCtxt {
         tcx: tcx,
         moves_map: moves_map,
-        moved_variables_set: moved_variables_set,
         capture_map: capture_map,
         stats: @BorrowStats {
             loaned_paths_same: Cell::new(0),
@@ -168,7 +166,6 @@ fn borrowck_fn(this: &mut BorrowckCtxt,
 pub struct BorrowckCtxt<'a> {
     tcx: &'a ty::ctxt,
     moves_map: &'a NodeSet,
-    moved_variables_set: &'a NodeSet,
     capture_map: &'a moves::CaptureMap,
 
     // Statistics:

branches/try2/src/librustc/middle/moves.rs

@@ -101,11 +101,6 @@ borrow checker and trans, for example, only care about the outermost
 expressions that are moved.  It is more efficient therefore just to
 store those entries.
 
-Sometimes though we want to know the variables that are moved (in
-particular in the borrow checker). For these cases, the set
-`moved_variables_set` just collects the ids of variables that are
-moved.
-
 Finally, the `capture_map` maps from the node_id of a closure
 expression to an array of `CaptureVar` structs detailing which
 variables are captured and how (by ref, by copy, by move).
@@ -170,7 +165,6 @@ pub struct MoveMaps {
      * pub Note: The `moves_map` stores expression ids that are moves,
      * whereas this set stores the ids of the variables that are
      * moved at some point */
-    pub moved_variables_set: NodeSet,
     pub capture_map: CaptureMap
 }
 
@@ -206,7 +200,6 @@ pub fn compute_moves(tcx: &ty::ctxt, krate: &Crate) -> MoveMaps {
         tcx: tcx,
         move_maps: MoveMaps {
             moves_map: NodeSet::new(),
-            moved_variables_set: NodeSet::new(),
             capture_map: NodeMap::new()
         }
     };
@@ -326,19 +319,6 @@ impl<'a> VisitContext<'a> {
         debug!("comp_mode = {:?}", comp_mode);
 
         match expr.node {
-            ExprPath(..) => {
-                match comp_mode {
-                    Move => {
-                        let def = self.tcx.def_map.borrow().get_copy(&expr.id);
-                        let r = moved_variable_node_id_from_def(def);
-                        for &id in r.iter() {
-                            self.move_maps.moved_variables_set.insert(id);
-                        }
-                    }
-                    Read => {}
-                }
-            }
-
             ExprUnary(UnDeref, base) => {      // *base
                 if !self.use_overloaded_operator(expr, base, []) {
                     // Moving out of *base moves out of base.
@@ -475,6 +455,7 @@ impl<'a> VisitContext<'a> {
                 self.use_expr(base, Read);
             }
 
+            ExprPath(..) |
             ExprInlineAsm(..) |
             ExprBreak(..) |
             ExprAgain(..) |

branches/try2/src/test/run-pass/borrowck-preserve-box-in-field.rs renamed to branches/try2/src/test/compile-fail/borrowck-preserve-box-in-field.rs

@@ -26,8 +26,10 @@ struct F { f: ~int }
 pub fn main() {
     let mut x = @F {f: ~3};
     borrow(x.f, |b_x| {
+    //~^ ERROR cannot borrow `x` as mutable because `*x.f` is also borrowed as immutable
         assert_eq!(*b_x, 3);
         assert_eq!(&(*x.f) as *int, &(*b_x) as *int);
+        //~^ NOTE borrow occurs due to use of `x` in closure
         x = @F {f: ~4};
 
         println!("&*b_x = {:p}", &(*b_x));

branches/try2/src/test/run-pass/borrowck-preserve-box-in-uniq.rs renamed to branches/try2/src/test/compile-fail/borrowck-preserve-box-in-uniq.rs

@@ -26,8 +26,10 @@ struct F { f: ~int }
 pub fn main() {
     let mut x = ~@F{f: ~3};
     borrow(x.f, |b_x| {
+    //~^ ERROR cannot borrow `x` as mutable because `*x.f` is also borrowed as immutable
         assert_eq!(*b_x, 3);
         assert_eq!(&(*x.f) as *int, &(*b_x) as *int);
+        //~^ NOTE  borrow occurs due to use of `x` in closure
         *x = @F{f: ~4};
 
         println!("&*b_x = {:p}", &(*b_x));

branches/try2/src/test/run-pass/borrowck-preserve-box.rs renamed to branches/try2/src/test/compile-fail/borrowck-preserve-box.rs

@@ -24,8 +24,10 @@ fn borrow(x: &int, f: |x: &int|) {
 pub fn main() {
     let mut x = @3;
     borrow(x, |b_x| {
+    //~^ ERROR cannot borrow `x` as mutable because `*x` is also borrowed as immutable
         assert_eq!(*b_x, 3);
         assert_eq!(&(*x) as *int, &(*b_x) as *int);
+        //~^ NOTE borrow occurs due to use of `x` in closure
         x = @22;
 
         println!("&*b_x = {:p}", &(*b_x));

branches/try2/src/test/run-pass/borrowck-preserve-cond-box.rs renamed to branches/try2/src/test/compile-fail/borrowck-preserve-cond-box.rs

@@ -30,8 +30,8 @@ fn testfn(cond: bool) {
     println!("*r = {}, exp = {}", *r, exp);
     assert_eq!(*r, exp);
 
-    x = @5;
-    y = @6;
+    x = @5; //~ERROR cannot assign to `x` because it is borrowed
+    y = @6; //~ERROR cannot assign to `y` because it is borrowed
 
     println!("*r = {}, exp = {}", *r, exp);
     assert_eq!(*r, exp);

branches/try2/src/test/run-pass/borrowck-preserve-expl-deref.rs renamed to branches/try2/src/test/compile-fail/borrowck-preserve-expl-deref.rs

@@ -26,8 +26,10 @@ struct F { f: ~int }
 pub fn main() {
     let mut x = @F {f: ~3};
     borrow((*x).f, |b_x| {
+    //~^ ERROR cannot borrow `x` as mutable because `*x.f` is also borrowed as immutable
         assert_eq!(*b_x, 3);
         assert_eq!(&(*x.f) as *int, &(*b_x) as *int);
+        //~^ NOTE borrow occurs due to use of `x` in closure
         x = @F {f: ~4};
 
         println!("&*b_x = {:p}", &(*b_x));

branches/try2/src/test/run-pass/regions-appearance-constraint.rs renamed to branches/try2/src/test/compile-fail/regions-appearance-constraint.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-/* Tests conditional rooting of the box y */
+// Test no-special rooting is used for managed boxes
 
 #![feature(managed_boxes)]
 
@@ -25,12 +25,11 @@ fn testfn(cond: bool) {
         exp = 4;
     }
 
-    x = @5;
-    y = @6;
+    x = @5; //~ERROR cannot assign to `x` because it is borrowed
+    y = @6; //~ERROR cannot assign to `y` because it is borrowed
     assert_eq!(*a, exp);
     assert_eq!(x, @5);
     assert_eq!(y, @6);
 }
 
-pub fn main() {
-}
+pub fn main() {}