De-mode vec::map, vec::eachi, vec::rev_each, vec::rev_eachi

9 files changed, 21 insertions, 25 deletions

diff --git a/src/libstd/base64.rs b/src/libstd/base64.rs
index 402b4241cb3..0da23db7291 100644
--- a/src/libstd/base64.rs
+++ b/src/libstd/base64.rs
@@ -79,8 +79,7 @@ impl ~[u8]: FromBase64 {
             if self[len - 2u] == '=' as u8 { padding += 1u; }
         }
 
-        let mut r = ~[];
-        vec::reserve(r, (len / 4u) * 3u - padding);
+        let mut r = vec::with_capacity((len / 4u) * 3u - padding);
 
         let mut i = 0u;
         while i < len {
diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs
index 9b34f455780..05875636415 100644
--- a/src/libstd/deque.rs
+++ b/src/libstd/deque.rs
@@ -28,11 +28,11 @@ fn create<T: Copy>() -> Deque<T> {
       * Grow is only called on full elts, so nelts is also len(elts), unlike
       * elsewhere.
       */
-    fn grow<T: Copy>(nelts: uint, lo: uint, +elts: ~[mut Cell<T>])
-      -> ~[mut Cell<T>] {
-        let elts = move elts;
+    fn grow<T: Copy>(nelts: uint, lo: uint, +elts: ~[Cell<T>])
+      -> ~[Cell<T>] {
+        let mut elts = move elts;
         assert (nelts == vec::len(elts));
-        let mut rv = ~[mut];
+        let mut rv = ~[];
 
         let mut i = 0u;
         let nalloc = uint::next_power_of_two(nelts + 1u);
@@ -62,7 +62,7 @@ fn create<T: Copy>() -> Deque<T> {
                 self.lo = self.elts.len() - 1u;
             } else { self.lo -= 1u; }
             if self.lo == self.hi {
-                self.elts.swap_mut(|v| grow(self.nelts, oldlo, move v));
+                self.elts.swap(|v| grow(self.nelts, oldlo, move v));
                 self.lo = self.elts.len() - 1u;
                 self.hi = self.nelts;
             }
@@ -71,7 +71,7 @@ fn create<T: Copy>() -> Deque<T> {
         }
         fn add_back(t: T) {
             if self.lo == self.hi && self.nelts != 0u {
-                self.elts.swap_mut(|v| grow(self.nelts, self.lo, move v));
+                self.elts.swap(|v| grow(self.nelts, self.lo, move v));
                 self.lo = 0u;
                 self.hi = self.nelts;
             }
diff --git a/src/libstd/map.rs b/src/libstd/map.rs
index 5373c1d336f..f28d7694b20 100644
--- a/src/libstd/map.rs
+++ b/src/libstd/map.rs
@@ -391,13 +391,11 @@ fn set_add<K:Eq IterBytes Hash Const Copy>(set: Set<K>, +key: K) -> bool {
 
 /// Convert a set into a vector.
 fn vec_from_set<T:Eq IterBytes Hash Copy>(s: Set<T>) -> ~[T] {
-    let mut v = ~[];
-    vec::reserve(v, s.size());
-    do s.each_key() |k| {
-        vec::push(v, k);
-        true
-    };
-    v
+    do vec::build_sized(s.size()) |push| {
+        for s.each_key() |k| {
+            push(k);
+        }
+    }
 }
 
 /// Construct a hashmap from a vector
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index c52255d60ca..3e104e259b8 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -156,7 +156,7 @@ mod v4 {
     }
     fn parse_to_ipv4_rep(ip: &str) -> result::Result<Ipv4Rep, ~str> {
         let parts = vec::map(str::split_char(ip, '.'), |s| {
-            match uint::from_str(s) {
+            match uint::from_str(*s) {
               Some(n) if n <= 255u => n,
               _ => 256u
             }
diff --git a/src/libstd/par.rs b/src/libstd/par.rs
index ae2590f9f8b..38a814b22e0 100644
--- a/src/libstd/par.rs
+++ b/src/libstd/par.rs
@@ -76,7 +76,7 @@ fn map_slices<A: Copy Send, B: Copy Send>(
 fn map<A: Copy Send, B: Copy Send>(xs: ~[A], f: fn~(A) -> B) -> ~[B] {
     vec::concat(map_slices(xs, || {
         fn~(_base: uint, slice : &[A], copy f) -> ~[B] {
-            vec::map(slice, |x| f(x))
+            vec::map(slice, |x| f(*x))
         }
     }))
 }
@@ -87,7 +87,7 @@ fn mapi<A: Copy Send, B: Copy Send>(xs: ~[A],
     let slices = map_slices(xs, || {
         fn~(base: uint, slice : &[A], copy f) -> ~[B] {
             vec::mapi(slice, |i, x| {
-                f(i + base, x)
+                f(i + base, *x)
             })
         }
     });
@@ -109,7 +109,7 @@ fn mapi_factory<A: Copy Send, B: Copy Send>(
         let f = f();
         fn~(base: uint, slice : &[A], move f) -> ~[B] {
             vec::mapi(slice, |i, x| {
-                f(i + base, x)
+                f(i + base, *x)
             })
         }
     });
diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs
index d26d0a484b2..2d49ede3507 100644
--- a/src/libstd/rope.rs
+++ b/src/libstd/rope.rs
@@ -864,7 +864,7 @@ mod node {
     fn bal(node: @Node) -> Option<@Node> {
         if height(node) < hint_max_node_height { return option::None; }
         //1. Gather all leaves as a forest
-        let mut forest = ~[mut];
+        let mut forest = ~[];
         let it = leaf_iterator::start(node);
         loop {
             match (leaf_iterator::next(&it)) {
diff --git a/src/libstd/serialization.rs b/src/libstd/serialization.rs
index ca0181eb646..af581ba4958 100644
--- a/src/libstd/serialization.rs
+++ b/src/libstd/serialization.rs
@@ -85,7 +85,7 @@ fn emit_from_vec<S: Serializer, T>(s: S, v: ~[T], f: fn(T)) {
     do s.emit_vec(vec::len(v)) {
         for vec::eachi(v) |i,e| {
             do s.emit_vec_elt(i) {
-                f(e)
+                f(*e)
             }
         }
     }
diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs
index afef3c5e5f9..46f79c01948 100644
--- a/src/libstd/sort.rs
+++ b/src/libstd/sort.rs
@@ -40,8 +40,7 @@ fn merge_sort<T: Copy>(le: Le<T>, v: &[const T]) -> ~[T] {
     }
 
     fn merge<T: Copy>(le: Le<T>, a: &[T], b: &[T]) -> ~[T] {
-        let mut rs = ~[];
-        vec::reserve(rs, len(a) + len(b));
+        let mut rs = vec::with_capacity(len(a) + len(b));
         let a_len = len(a);
         let mut a_ix = 0u;
         let b_len = len(b);
diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs
index b2e9def6d73..0fd80d4acf4 100644
--- a/src/libstd/sync.rs
+++ b/src/libstd/sync.rs
@@ -80,11 +80,11 @@ fn new_sem<Q: Send>(count: int, +q: Q) -> Sem<Q> {
 #[doc(hidden)]
 fn new_sem_and_signal(count: int, num_condvars: uint)
         -> Sem<~[mut Waitqueue]> {
-    let mut queues = ~[mut];
+    let mut queues = ~[];
     for num_condvars.times {
         vec::push(queues, new_waitqueue());
     }
-    new_sem(count, move queues)
+    new_sem(count, vec::to_mut(move queues))
 }
 
 #[doc(hidden)]