---

yaml
---
r: 152357
b: refs/heads/try2
c: 653f57a
h: refs/heads/master
i:
  152355: 39dc182
v: v3

Author: Cameron Zwarich

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

branches/try2/src/test/compile-fail/borrowck-field-sensitivity.rs

@@ -84,6 +84,20 @@ fn fu_move_after_fu_move() {
 
 // The following functions aren't yet accepted, but they should be.
 
+fn move_after_borrow_correct() {
+    let x = A { a: 1, b: box 2 };
+    let p = &x.a;
+    drop(x.b); //~ ERROR cannot move out of `x.b` because it is borrowed
+    drop(*p);
+}
+
+fn fu_move_after_borrow_correct() {
+    let x = A { a: 1, b: box 2 };
+    let p = &x.a;
+    let _y = A { a: 3, .. x }; //~ ERROR cannot move out of `x.b` because it is borrowed
+    drop(*p);
+}
+
 fn copy_after_field_assign_after_uninit() {
     let mut x: A;
     x.a = 1;
@@ -117,6 +131,9 @@ fn main() {
     fu_move_after_move();
     fu_move_after_fu_move();
 
+    move_after_borrow_correct();
+    fu_move_after_borrow_correct();
+
     copy_after_field_assign_after_uninit();
     borrow_after_field_assign_after_uninit();
     move_after_field_assign_after_uninit();

branches/try2/src/test/run-pass/borrowck-field-sensitivity.rs

@@ -73,18 +73,6 @@ fn borrow_after_fu_move() {
     borrow(&x.a);
 }
 
-fn move_after_borrow() {
-    let x = A { a: 1, b: box 2 };
-    borrow(&x.a);
-    drop(x.b);
-}
-
-fn fu_move_after_borrow() {
-    let x = A { a: 1, b: box 2 };
-    borrow(&x.a);
-    let _y = A { a: 3, .. x };
-}
-
 fn mut_borrow_after_mut_borrow() {
     let mut x = A { a: 1, b: box 2 };
     let y = &mut x.a;
@@ -232,8 +220,6 @@ fn main() {
 
     borrow_after_move();
     borrow_after_fu_move();
-    move_after_borrow();
-    fu_move_after_borrow();
     mut_borrow_after_mut_borrow();
 
     move_after_move();