---

yaml
---
r: 42822
b: refs/heads/try
c: a8ff91a
h: refs/heads/master
v: v3

Author: bstrie

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 7d8ae4403e3d10ca8304b4a1bd90ac7cade5d713
+refs/heads/try: a8ff91a630880fabc047d3d3d9383da2a9d59378
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/libcore/run.rs

@@ -289,7 +289,7 @@ pub fn start_program(prog: &str, args: &[~str]) -> Program {
 
 fn read_all(rd: io::Reader) -> ~str {
     let buf = io::with_bytes_writer(|wr| {
-        let mut bytes = [mut 0, ..4096];
+        let mut bytes = [0, ..4096];
         while !rd.eof() {
             let nread = rd.read(bytes, bytes.len());
             wr.write(bytes.view(0, nread));
@@ -387,7 +387,7 @@ pub fn readclose(fd: c_int) -> ~str {
         let file = os::fdopen(fd);
         let reader = io::FILE_reader(file, false);
         let buf = io::with_bytes_writer(|writer| {
-            let mut bytes = [mut 0, ..4096];
+            let mut bytes = [0, ..4096];
             while !reader.eof() {
                 let nread = reader.read(bytes, bytes.len());
                 writer.write(bytes.view(0, nread));

branches/try/src/librustdoc/markdown_writer.rs

@@ -156,7 +156,7 @@ fn readclose(fd: libc::c_int) -> ~str {
         let file = os::fdopen(fd);
         let reader = io::FILE_reader(file, false);
         let buf = io::with_bytes_writer(|writer| {
-            let mut bytes = [mut 0, ..4096];
+            let mut bytes = [0, ..4096];
             while !reader.eof() {
                 let nread = reader.read(bytes, bytes.len());
                 writer.write(bytes.view(0, nread));

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

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 fn main() {
-    let mut x: ~[mut int] = ~[mut 3];
+    let mut x: ~[mut int] = ~[3];
     let y: ~[int] = ~[3];
     x = y; //~ ERROR values differ in mutability
 }

branches/try/src/test/compile-fail/borrowck-assign-comp-idx.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/try/src/test/compile-fail/issue-2548.rs

@@ -33,7 +33,7 @@ fn main() {
     {
         let mut res = foo(x);
 
-        let mut v = ~[mut];
+        let mut v = ~[];
         v = move ~[mut (move res)] + v; //~ ERROR instantiating a type parameter with an incompatible type (needs `copy`, got `&static`, missing `copy`)
         assert (v.len() == 2);
     }

branches/try/src/test/compile-fail/issue-2969.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/try/src/test/compile-fail/issue-3243.rs

@@ -10,7 +10,7 @@
 
 // xfail-test
 fn function() -> &[mut int] {
-    let mut x: &static/[mut int] = &[mut 1,2,3];
+    let mut x: &static/[mut int] = &[1,2,3];
     x[0] = 12345;
     x //~ ERROR bad
 }