---

yaml
---
r: 138527
b: refs/heads/try2
c: 8fceee6
h: refs/heads/master
i:
  138525: dd1c8b2
  138523: b3dabdc
  138519: 269661f
  138511: 8c43b48
  138495: c8ead27
v: v3

Author: pcwalton

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

branches/try2/src/test/compile-fail/assign-super.rs

@@ -11,7 +11,7 @@
 type point = { x: int, y: int };
 
 fn a() {
-    let mut p = ~[mut 1];
+    let mut p = ~[1];
 
     // Create an immutable pointer into p's contents:
     let _q: &int = &p[0]; //~ NOTE loan of mutable vec content granted here
@@ -25,7 +25,7 @@ fn b() {
     // here we alias the mutable vector into an imm slice and try to
     // modify the original:
 
-    let mut p = ~[mut 1];
+    let mut p = ~[1];
 
     do borrow(p) { //~ NOTE loan of mutable vec content granted here
         p[0] = 5; //~ ERROR assigning to mutable vec content prohibited due to outstanding loan
@@ -35,7 +35,7 @@ fn b() {
 fn c() {
     // Legal because the scope of the borrow does not include the
     // modification:
-    let mut p = ~[mut 1];
+    let mut p = ~[1];
     borrow(p, ||{});
     p[0] = 5;
 }

branches/try2/src/test/compile-fail/borrowck-assign-comp-idx.rs

@@ -17,13 +17,13 @@ fn takes_imm_elt(_v: &int, f: fn()) {
 }
 
 fn has_mut_vec_and_does_not_try_to_change_it() {
-    let v = ~[mut 1, 2, 3];
+    let mut v = ~[1, 2, 3];
     do takes_imm_elt(&v[0]) {
     }
 }
 
 fn has_mut_vec_but_tries_to_change_it() {
-    let v = ~[mut 1, 2, 3];
+    let mut v = ~[1, 2, 3];
     do takes_imm_elt(&v[0]) { //~ NOTE loan of mutable vec content granted here
         v[1] = 4; //~ ERROR assigning to mutable vec content prohibited due to outstanding loan
     }
@@ -34,7 +34,7 @@ fn takes_const_elt(_v: &const int, f: fn()) {
 }
 
 fn has_mut_vec_and_tries_to_change_it() {
-    let v = ~[mut 1, 2, 3];
+    let mut v = ~[1, 2, 3];
     do takes_const_elt(&const v[0]) {
         v[1] = 4;
     }

branches/try2/src/test/compile-fail/borrowck-loan-vec-content.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn write(v: &[mut int]) {
+fn write(v: &mut [int]) {
     v[0] += 1;
 }
 

branches/try2/src/test/compile-fail/borrowck-mut-slice-of-imm-vec.rs

@@ -1,5 +1,5 @@
 fn main() {
-    let a = [mut 1, 2, 3, 4];
+    let mut a = [1, 2, 3, 4];
     let _ = match a {
         [1, 2, ..tail] => tail,
         _ => core::util::unreachable()

branches/try2/src/test/compile-fail/borrowck-mut-vec-as-imm-slice-bad.rs

@@ -12,7 +12,7 @@
 fn main()
 {
 // See #2969 -- error message should be improved
-   let mut x = [mut 1, 2, 4];
+   let mut x = [1, 2, 4];
    let v : &int = &x[2];
    x[2] = 6;
    assert *v == 6;

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

@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // xfail-test
-fn function() -> &[mut int] {
-    let mut x: &static/[mut int] = &[mut 1,2,3];
+fn function() -> &mut [int] {
+    let mut x: &static/mut [int] = &[1,2,3];
     x[0] = 12345;
     x //~ ERROR bad
 }

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

@@ -11,8 +11,6 @@
 fn two_args<T>(x: T, y: T) { }
 
 fn main() {
-    let x: ~[mut int] = ~[mut 3];
-    let y: ~[int] = ~[3];
     let a: @mut int = @mut 3;
     let b: @int = @3;
 
@@ -22,6 +20,5 @@ fn main() {
     // shortcoming of the current inference algorithm.  These errors
     // are *not* desirable.
 
-    two_args(x, y); //~ ERROR (values differ in mutability)
     two_args(a, b); //~ ERROR (values differ in mutability)
 }

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

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 struct invariant {
-    f: @[mut &int]
+    f: @mut [&int]
 }
 
 fn to_same_lifetime(bi: invariant/&r) {