---

yaml
---
r: 179054
b: refs/heads/master
c: 4583272
h: refs/heads/master
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 128ac9dfcbb096c8bbc373f554a0c97ca3e9e030
+refs/heads/master: 4583272bf5054e84c4c59ba3b9334a52cfcf5208
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ac134f7ca435551964996ee88319241cd3c7c110
 refs/heads/try: ccf8fedf1cffcb8f6f3581d53d220039e192fe77

trunk/src/test/compile-fail/borrowck-array-double-move.rs

@@ -10,10 +10,10 @@
 
 fn test() {
     let w: &mut [isize];
-    w[5] = 0; //~ ERROR use of possibly uninitialized variable: `w`
+    w[5] = 0; //~ ERROR use of possibly uninitialized variable: `*w`
 
     let mut w: &mut [isize];
-    w[5] = 0; //~ ERROR use of possibly uninitialized variable: `w`
+    w[5] = 0; //~ ERROR use of possibly uninitialized variable: `*w`
 }
 
 fn main() { test(); }

trunk/src/test/compile-fail/borrowck-use-in-index-lvalue.rs

@@ -14,6 +14,8 @@ fn main() {
         [1, 2, tail..] => tail,
         _ => unreachable!()
     };
-    a[0] = 0; //~ ERROR cannot assign to `a[..]` because it is borrowed
+    println!("t[0]: {}", t[0]);
+    a[2] = 0; //~ ERROR cannot assign to `a[..]` because it is borrowed
+    println!("t[0]: {}", t[0]);
     t[0];
 }

trunk/src/test/compile-fail/borrowck-vec-pattern-move-tail.rs

@@ -33,15 +33,6 @@ pub fn test_move_array_into_recv(a: [D; 3], recv: &mut [D; 3]) {
     *recv = a;
 }
 
-#[rustc_move_fragments]
-pub fn test_extract_array_elem(a: [D; 3], i: usize) -> D {
-    //~^ ERROR                 parent_of_fragments: `$(local a)`
-    //~| ERROR                  assigned_leaf_path: `$(local i)`
-    //~| ERROR                     moved_leaf_path: `$(local a).[]`
-    //~| ERROR                    unmoved_fragment: `$(allbutone $(local a).[])`
-    a[i]
-}
-
 #[rustc_move_fragments]
 pub fn test_overwrite_array_elem(mut a: [D; 3], i: usize, d: D) {
     //~^ ERROR                 parent_of_fragments: `$(local mut a)`
@@ -53,48 +44,4 @@ pub fn test_overwrite_array_elem(mut a: [D; 3], i: usize, d: D) {
     a[i] = d;
 }
 
-// FIXME (pnkfelix): Both test_move_array_then_overwrite_elem1 and
-// test_move_array_then_overwrite_elem2 illustrate a behavior that
-// we need to make illegal if we want to get rid of drop-flags.
-// See RFC PR 320 for more discussion.
-
-#[rustc_move_fragments]
-pub fn test_move_array_then_overwrite_elem1(mut a: [D; 3], i: usize, recv: &mut [D; 3], d: D) {
-    //~^ ERROR                 parent_of_fragments: `$(local mut a)`
-    //~| ERROR                 parent_of_fragments: `$(local recv)`
-    //~| ERROR                  assigned_leaf_path: `$(local recv).*`
-    //~| ERROR                  assigned_leaf_path: `$(local i)`
-    //~| ERROR                  assigned_leaf_path: `$(local d)`
-    //~| ERROR                     moved_leaf_path: `$(local d)`
-    //~| ERROR                  assigned_leaf_path: `$(local mut a).[]`
-    //~| ERROR                    unmoved_fragment: `$(allbutone $(local mut a).[])`
-
-    // This test covers the case where the array contents have been all moved away, but
-    // we still need to deal with new initializing writes into the array.
-    *recv = a;
-    a[i] = d;
-}
-
-#[rustc_move_fragments]
-pub fn test_move_array_then_overwrite_elem2(mut a: [D; 3], i: usize, j: usize,
-                                            recv: &mut [D; 3], d1: D, d2: D) {
-    //~^^ ERROR                parent_of_fragments: `$(local mut a)`
-    //~| ERROR                 parent_of_fragments: `$(local recv)`
-    //~| ERROR                  assigned_leaf_path: `$(local recv).*`
-    //~| ERROR                  assigned_leaf_path: `$(local i)`
-    //~| ERROR                  assigned_leaf_path: `$(local j)`
-    //~| ERROR                  assigned_leaf_path: `$(local d1)`
-    //~| ERROR                  assigned_leaf_path: `$(local d2)`
-    //~| ERROR                     moved_leaf_path: `$(local d1)`
-    //~| ERROR                     moved_leaf_path: `$(local d2)`
-    //~| ERROR                  assigned_leaf_path: `$(local mut a).[]`
-    //~| ERROR                    unmoved_fragment: `$(allbutone $(local mut a).[])`
-
-    // This test covers the case where the array contents have been all moved away, but
-    // we still need to deal with new initializing writes into the array.
-    *recv = a;
-    a[i] = d1;
-    a[j] = d2;
-}
-
 pub fn main() { }