RIMOV, round 7

find ./ -type f -name "*.rs" -exec sed -i "s/ mut \([a-zA-Z_]\+\):
~\[mut / mut \1: ~\[/g" {} \;

Author: bstrie

src/libstd/bitv.rs

@@ -106,7 +106,7 @@ impl SmallBitv {
 
 struct BigBitv {
     // only mut b/c of clone and lack of other constructor
-    mut storage: ~[mut uint]
+    mut storage: ~[uint]
 }
 
 fn BigBitv(storage: ~[mut uint]) -> BigBitv {

src/libstd/map.rs

@@ -144,7 +144,7 @@ pub mod chained {
 
     struct HashMap_<K, V> {
         mut count: uint,
-        mut chains: ~[mut Option<@Entry<K,V>>]
+        mut chains: ~[Option<@Entry<K,V>>]
     }
 
     pub type T<K, V> = @HashMap_<K, V>;

src/libsyntax/print/pp.rs

@@ -264,7 +264,7 @@ pub type printer_ = {
     // BEGIN (if there is any) on top of it. Stuff is flushed off the
     // bottom as it becomes irrelevant due to the primary ring-buffer
     // advancing.
-    mut scan_stack: ~[mut uint],
+    mut scan_stack: ~[uint],
     mut scan_stack_empty: bool, // top==bottom disambiguator
     mut top: uint, // index of top of scan_stack
     mut bottom: uint, // index of bottom of scan_stack

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]] = ~[~[0]];
+    let mut v: ~[~[mut int]] = ~[~[0]];
 
     fn f(&&v: ~[mut ~[const int]]) {
         v[0] = ~[3]

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]]] = ~[~[~[0]]];
+    let mut v: ~[~[mut ~[int]]] = ~[~[~[0]]];
 
     fn f(&&v: ~[mut ~[mut ~[const int]]]) {
         v[0][1] = ~[mut 3]