diff --git a/src/libcore/uint-template.rs b/src/libcore/uint-template.rs index cef9f22908f5..eee82f4626fa 100644 --- a/src/libcore/uint-template.rs +++ b/src/libcore/uint-template.rs @@ -252,7 +252,7 @@ pub pure fn to_str_bytes(neg: bool, num: T, radix: uint, // Enough room to hold any number in any radix. // Worst case: 64-bit number, binary-radix, with // a leading negative sign = 65 bytes. - let mut buf : [mut u8 * 65] = [0u8, ..65]; + let mut buf : [u8 * 65] = [0u8, ..65]; let len = buf.len(); let mut i = len; diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs index aa211544b37c..f18d72c0d886 100644 --- a/src/libcore/vec.rs +++ b/src/libcore/vec.rs @@ -3155,7 +3155,7 @@ mod tests { #[test] fn reverse_and_reversed() { - let mut v: ~[mut int] = ~[10, 20]; + let mut v: ~[int] = ~[10, 20]; assert (v[0] == 10); assert (v[1] == 20); reverse(v); @@ -3170,7 +3170,7 @@ mod tests { let v4 = reversed::(~[]); assert (v4 == ~[]); - let mut v3: ~[mut int] = ~[]; + let mut v3: ~[int] = ~[]; reverse::(v3); } diff --git a/src/libfuzzer/cycles.rs b/src/libfuzzer/cycles.rs index 80ba52e950f9..62401b4b434f 100644 --- a/src/libfuzzer/cycles.rs +++ b/src/libfuzzer/cycles.rs @@ -68,7 +68,7 @@ fn nop(_x: T) { } fn test_cycles(r : rand::rng, k: uint, n: uint) { - let mut v : ~[mut @pointy] = ~[]; + let mut v : ~[@pointy] = ~[]; // Create a graph with no edges range(0u, vlen) {|_i| diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs index b7e2b8f6e71c..fab98f5d571c 100644 --- a/src/libstd/rope.rs +++ b/src/libstd/rope.rs @@ -1163,7 +1163,7 @@ pub mod node { } pub fn empty() -> T { - let mut stack : ~[mut @Node] = ~[]; + let mut stack : ~[@Node] = ~[]; T { stack: stack, stackpos: -1 } } diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs index e376baad60a4..648b07ae0241 100644 --- a/src/libstd/sort.rs +++ b/src/libstd/sort.rs @@ -750,11 +750,11 @@ mod test_qsort3 { check_sort(v1, v2); } { - let mut v1: ~[mut int] = ~[]; - let mut v2: ~[mut int] = ~[]; + let mut v1: ~[int] = ~[]; + let mut v2: ~[int] = ~[]; check_sort(v1, v2); } - { let mut v1 = ~[mut 9]; let v2 = ~[9]; check_sort(v1, v2); } + { let mut v1 = ~[9]; let v2 = ~[9]; check_sort(v1, v2); } { let mut v1 = ~[9, 3, 3, 3, 9]; let mut v2 = ~[3, 3, 3, 9, 9]; @@ -797,11 +797,11 @@ mod test_qsort { check_sort(v1, v2); } { - let mut v1: ~[mut int] = ~[]; - let mut v2: ~[mut int] = ~[]; + let mut v1: ~[int] = ~[]; + let mut v2: ~[int] = ~[]; check_sort(v1, v2); } - { let mut v1 = ~[mut 9]; let v2 = ~[9]; check_sort(v1, v2); } + { let mut v1 = ~[9]; let v2 = ~[9]; check_sort(v1, v2); } { let mut v1 = ~[9, 3, 3, 3, 9]; let mut v2 = ~[3, 3, 3, 9, 9]; @@ -947,11 +947,11 @@ mod test_tim_sort { check_sort(v1, v2); } { - let mut v1: ~[mut int] = ~[]; - let mut v2: ~[mut int] = ~[]; + let mut v1: ~[int] = ~[]; + let mut v2: ~[int] = ~[]; check_sort(v1, v2); } - { let mut v1 = ~[mut 9]; let v2 = ~[9]; check_sort(v1, v2); } + { let mut v1 = ~[9]; let v2 = ~[9]; check_sort(v1, v2); } { let mut v1 = ~[9, 3, 3, 3, 9]; let mut v2 = ~[3, 3, 3, 9, 9]; diff --git a/src/test/compile-fail/lub-in-args.rs b/src/test/compile-fail/lub-in-args.rs index aa2dc8cda355..8734ef8c0aae 100644 --- a/src/test/compile-fail/lub-in-args.rs +++ b/src/test/compile-fail/lub-in-args.rs @@ -11,7 +11,7 @@ fn two_args(x: T, y: T) { } fn main() { - let mut x: ~[mut int] = ~[3]; + let mut x: ~[int] = ~[3]; let y: ~[int] = ~[3]; let a: @mut int = @mut 3; let b: @int = @3; diff --git a/src/test/compile-fail/mutable-huh-variance-vec1.rs b/src/test/compile-fail/mutable-huh-variance-vec1.rs index 404424ba44b8..93f734b39abc 100644 --- a/src/test/compile-fail/mutable-huh-variance-vec1.rs +++ b/src/test/compile-fail/mutable-huh-variance-vec1.rs @@ -12,7 +12,7 @@ fn main() { // Note: explicit type annot is required here // because otherwise the inference gets smart // and assigns a type of ~[mut ~[const int]]. - let mut v: ~[mut ~[int]] = ~[~[0]]; + let mut v: ~[~[int]] = ~[~[0]]; fn f(&&v: ~[mut ~[const int]]) { v[0] = ~[mut 3] diff --git a/src/test/compile-fail/mutable-huh-variance-vec2.rs b/src/test/compile-fail/mutable-huh-variance-vec2.rs index 4ece2cb0c546..be3f28a440f9 100644 --- a/src/test/compile-fail/mutable-huh-variance-vec2.rs +++ b/src/test/compile-fail/mutable-huh-variance-vec2.rs @@ -12,7 +12,7 @@ fn main() { // Note: explicit type annot is required here // because otherwise the inference gets smart // and assigns a type of ~[mut ~[const int]]. - let mut v: ~[mut ~[mut int]] = ~[mut ~[0]]; + let mut v: ~[mut ~[mut int]] = ~[~[0]]; fn f(&&v: ~[mut ~[const int]]) { v[0] = ~[3] diff --git a/src/test/compile-fail/mutable-huh-variance-vec3.rs b/src/test/compile-fail/mutable-huh-variance-vec3.rs index b95da9725ae9..eaf10e314ae8 100644 --- a/src/test/compile-fail/mutable-huh-variance-vec3.rs +++ b/src/test/compile-fail/mutable-huh-variance-vec3.rs @@ -12,7 +12,7 @@ fn main() { // Note: explicit type annot is required here // because otherwise the inference gets smart // and assigns a type of ~[mut ~[const int]]. - let mut v: ~[mut ~[mut ~[int]]] = ~[mut ~[~[0]]]; + let mut v: ~[mut ~[mut ~[int]]] = ~[~[~[0]]]; fn f(&&v: ~[mut ~[mut ~[const int]]]) { v[0][1] = ~[mut 3] diff --git a/src/test/compile-fail/mutable-huh-variance-vec4.rs b/src/test/compile-fail/mutable-huh-variance-vec4.rs index 37bc5697230c..046f6b71d008 100644 --- a/src/test/compile-fail/mutable-huh-variance-vec4.rs +++ b/src/test/compile-fail/mutable-huh-variance-vec4.rs @@ -14,8 +14,8 @@ fn main() { // but we do express conflicting requirements: let mut v = ~[~[0]]; - let mut w = ~[mut ~[0]]; - let mut x = ~[mut ~[0]]; + let mut w = ~[~[0]]; + let mut x = ~[~[0]]; fn f(&&v: ~[mut ~[int]]) { v[0] = ~[3] diff --git a/src/test/run-pass/empty-mutable-vec.rs b/src/test/run-pass/empty-mutable-vec.rs index bbd7ceb76369..7ab10a0b3e9d 100644 --- a/src/test/run-pass/empty-mutable-vec.rs +++ b/src/test/run-pass/empty-mutable-vec.rs @@ -10,4 +10,4 @@ -fn main() { let mut v: ~[mut int] = ~[]; } +fn main() { let mut v: ~[int] = ~[]; } diff --git a/src/test/run-pass/foreach-nested.rs b/src/test/run-pass/foreach-nested.rs index a8f4597fd146..958910376947 100644 --- a/src/test/run-pass/foreach-nested.rs +++ b/src/test/run-pass/foreach-nested.rs @@ -15,7 +15,7 @@ fn two(it: fn(int)) { it(0); it(1); } fn main() { - let mut a: ~[mut int] = ~[-1, -1, -1, -1]; + let mut a: ~[int] = ~[-1, -1, -1, -1]; let mut p: int = 0; do two |i| { do two |j| { a[p] = 10 * i + j; p += 1; } diff --git a/src/test/run-pass/log-linearized.rs b/src/test/run-pass/log-linearized.rs index 532dee7e4da2..a9e3f9d02617 100644 --- a/src/test/run-pass/log-linearized.rs +++ b/src/test/run-pass/log-linearized.rs @@ -20,7 +20,7 @@ struct Smallintmap {mut v: ~[mut option]} struct V { v: ~[mut option] } fn mk() -> @Smallintmap { - let mut v: ~[mut option] = ~[]; + let mut v: ~[option] = ~[]; return @Smallintmap {mut v: move v}; } diff --git a/src/test/run-pass/swap-2.rs b/src/test/run-pass/swap-2.rs index 7dc37cbc62ee..09360e0ec94a 100644 --- a/src/test/run-pass/swap-2.rs +++ b/src/test/run-pass/swap-2.rs @@ -11,7 +11,7 @@ fn swap(v: &[mut T], i: int, j: int) { v[i] <-> v[j]; } fn main() { - let mut a: ~[mut int] = ~[0, 1, 2, 3, 4, 5, 6]; + let mut a: ~[int] = ~[0, 1, 2, 3, 4, 5, 6]; swap(a, 2, 4); assert (a[2] == 4); assert (a[4] == 2);