From a8ff91a630880fabc047d3d3d9383da2a9d59378 Mon Sep 17 00:00:00 2001 From: Ben Striegel Date: Tue, 29 Jan 2013 21:02:53 -0500 Subject: [PATCH] Removing interior mut on vectors, round 1 find ./ -type f -name "*.rs" -exec sed -i "s/let mut\(.*\)\[mut[ ]\?/let mut\1\[/g" {} \; --- src/libcore/run.rs | 4 ++-- src/librustdoc/markdown_writer.rs | 2 +- src/test/compile-fail/assign-super.rs | 2 +- src/test/compile-fail/borrowck-assign-comp-idx.rs | 6 +++--- src/test/compile-fail/issue-2548.rs | 2 +- src/test/compile-fail/issue-2969.rs | 2 +- src/test/compile-fail/issue-3243.rs | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libcore/run.rs b/src/libcore/run.rs index 8aeae1adeec2..0963c8bbcd2d 100644 --- a/src/libcore/run.rs +++ b/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)); diff --git a/src/librustdoc/markdown_writer.rs b/src/librustdoc/markdown_writer.rs index 50e4fd759c44..1069129e9163 100644 --- a/src/librustdoc/markdown_writer.rs +++ b/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)); diff --git a/src/test/compile-fail/assign-super.rs b/src/test/compile-fail/assign-super.rs index a728a64f53b6..cc5244b8050b 100644 --- a/src/test/compile-fail/assign-super.rs +++ b/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 } \ No newline at end of file diff --git a/src/test/compile-fail/borrowck-assign-comp-idx.rs b/src/test/compile-fail/borrowck-assign-comp-idx.rs index 21236dc4a83c..ded47fc9f7fe 100644 --- a/src/test/compile-fail/borrowck-assign-comp-idx.rs +++ b/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; } diff --git a/src/test/compile-fail/issue-2548.rs b/src/test/compile-fail/issue-2548.rs index 2684289d70f7..e9dd047d5c63 100644 --- a/src/test/compile-fail/issue-2548.rs +++ b/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); } diff --git a/src/test/compile-fail/issue-2969.rs b/src/test/compile-fail/issue-2969.rs index 5e1b9397247d..88c76fb31a1f 100644 --- a/src/test/compile-fail/issue-2969.rs +++ b/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; diff --git a/src/test/compile-fail/issue-3243.rs b/src/test/compile-fail/issue-3243.rs index 4a09e93deff3..de2be1a1e794 100644 --- a/src/test/compile-fail/issue-3243.rs +++ b/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 }