auto merge of #11956 : edwardw/rust/issue-7556, r=cmr

Closes #7556.

Also move ``std::util::Void`` to ``std::any::Void``. It makes more sense to me.

17 files changed, 32 insertions, 39 deletions

diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs
index 6ad2d8f8c8d..743472af5ce 100644
--- a/src/test/bench/core-std.rs
+++ b/src/test/bench/core-std.rs
@@ -15,11 +15,11 @@
 extern mod extra;
 
 use extra::time::precise_time_s;
+use std::mem::swap;
 use std::os;
 use std::rand::Rng;
 use std::rand;
 use std::str;
-use std::util;
 use std::vec;
 use std::io::File;
 
@@ -125,7 +125,7 @@ fn vec_push_all() {
             v.push_all(rv);
         }
         else {
-            util::swap(&mut v, &mut rv);
+            swap(&mut v, &mut rv);
             v.push_all(rv);
         }
     }
diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs
index 375f9154841..27389ecf6ee 100644
--- a/src/test/bench/shootout-k-nucleotide-pipes.rs
+++ b/src/test/bench/shootout-k-nucleotide-pipes.rs
@@ -18,12 +18,12 @@ extern mod extra;
 use std::cmp::Ord;
 use std::comm;
 use std::hashmap::HashMap;
+use std::mem::replace;
 use std::option;
 use std::os;
 use std::io;
 use std::str;
 use std::task;
-use std::util;
 use std::vec;
 
 fn f64_cmp(x: f64, y: f64) -> Ordering {
@@ -161,7 +161,7 @@ fn main() {
     let mut from_child = ~[];
     let to_child   = sizes.iter().zip(streams.mut_iter()).map(|(sz, stream_ref)| {
         let sz = *sz;
-        let stream = util::replace(stream_ref, None);
+        let stream = replace(stream_ref, None);
         let (from_child_, to_parent_) = stream.unwrap();
 
         from_child.push(from_child_);
diff --git a/src/test/bench/shootout-meteor.rs b/src/test/bench/shootout-meteor.rs
index c06f338f018..496e09b4651 100644
--- a/src/test/bench/shootout-meteor.rs
+++ b/src/test/bench/shootout-meteor.rs
@@ -24,7 +24,7 @@ struct Iterate<'a, T> {
 impl<'a, T> Iterator<T> for Iterate<'a, T> {
     fn next(&mut self) -> Option<T> {
         let mut res = (self.f)(&self.next);
-        std::util::swap(&mut res, &mut self.next);
+        std::mem::swap(&mut res, &mut self.next);
         Some(res)
     }
 }
diff --git a/src/test/compile-fail/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs b/src/test/compile-fail/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
index d19538c5d36..7bee06b7804 100644
--- a/src/test/compile-fail/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
+++ b/src/test/compile-fail/borrowck-borrow-mut-base-ptr-in-aliasable-loc.rs
@@ -13,8 +13,6 @@
 //
 // Example from src/middle/borrowck/doc.rs
 
-use std::util::swap;
-
 fn foo(t0: & &mut int) {
     let t1 = t0;
     let p: &int = &**t0;
diff --git a/src/test/compile-fail/borrowck-borrow-of-mut-base-ptr.rs b/src/test/compile-fail/borrowck-borrow-of-mut-base-ptr.rs
index 3f67952fa8e..954ec82e40f 100644
--- a/src/test/compile-fail/borrowck-borrow-of-mut-base-ptr.rs
+++ b/src/test/compile-fail/borrowck-borrow-of-mut-base-ptr.rs
@@ -13,8 +13,6 @@
 //
 // Example from src/middle/borrowck/doc.rs
 
-use std::util::swap;
-
 fn foo<'a>(mut t0: &'a mut int,
            mut t1: &'a mut int) {
     let p: &mut int = &mut *t0; // Claims `*t0`
diff --git a/src/test/compile-fail/borrowck-move-mut-base-ptr.rs b/src/test/compile-fail/borrowck-move-mut-base-ptr.rs
index 0015ddf368e..ce2755dbc0f 100644
--- a/src/test/compile-fail/borrowck-move-mut-base-ptr.rs
+++ b/src/test/compile-fail/borrowck-move-mut-base-ptr.rs
@@ -13,8 +13,6 @@
 //
 // Example from src/middle/borrowck/doc.rs
 
-use std::util::swap;
-
 fn foo(t0: &mut int) {
     let p: &int = &*t0; // Freezes `*t0`
     let t1 = t0;        //~ ERROR cannot move out of `t0`
diff --git a/src/test/compile-fail/borrowck-mut-borrow-of-mut-base-ptr.rs b/src/test/compile-fail/borrowck-mut-borrow-of-mut-base-ptr.rs
index b41fa5b8d33..fb018f3d4bc 100644
--- a/src/test/compile-fail/borrowck-mut-borrow-of-mut-base-ptr.rs
+++ b/src/test/compile-fail/borrowck-mut-borrow-of-mut-base-ptr.rs
@@ -13,8 +13,6 @@
 //
 // Example from src/middle/borrowck/doc.rs
 
-use std::util::swap;
-
 fn foo<'a>(mut t0: &'a mut int,
            mut t1: &'a mut int) {
     let p: &int = &*t0;     // Freezes `*t0`
diff --git a/src/test/compile-fail/borrowck-swap-mut-base-ptr.rs b/src/test/compile-fail/borrowck-swap-mut-base-ptr.rs
index 06b66c2627c..3e8a0f87659 100644
--- a/src/test/compile-fail/borrowck-swap-mut-base-ptr.rs
+++ b/src/test/compile-fail/borrowck-swap-mut-base-ptr.rs
@@ -13,7 +13,7 @@
 //
 // Example from src/middle/borrowck/doc.rs
 
-use std::util::swap;
+use std::mem::swap;
 
 fn foo<'a>(mut t0: &'a mut int,
            mut t1: &'a mut int) {
diff --git a/src/test/compile-fail/lint-unused-imports.rs b/src/test/compile-fail/lint-unused-imports.rs
index c7565fa0169..8d294af3e3e 100644
--- a/src/test/compile-fail/lint-unused-imports.rs
+++ b/src/test/compile-fail/lint-unused-imports.rs
@@ -14,8 +14,8 @@
 
 use cal = bar::c::cc;
 
-use std::util::*;              // shouldn't get errors for not using
-                                // everything imported
+use std::mem::*;            // shouldn't get errors for not using
+                            // everything imported
 
 // Should get errors for both 'Some' and 'None'
 use std::option::{Some, None}; //~ ERROR unused import
@@ -61,8 +61,9 @@ mod bar {
 
 fn main() {
     cal(foo::Point{x:3, y:9});
-    let a = 3;
-    id(a);
+    let mut a = 3;
+    let mut b = 4;
+    swap(&mut a, &mut b);
     test::C.b();
     let _a = from_elem(0, 0);
 }
diff --git a/src/test/run-pass/borrowck-mut-uniq.rs b/src/test/run-pass/borrowck-mut-uniq.rs
index 542a8251f71..10760236e6d 100644
--- a/src/test/run-pass/borrowck-mut-uniq.rs
+++ b/src/test/run-pass/borrowck-mut-uniq.rs
@@ -8,16 +8,16 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::util;
+use std::mem::swap;
 
 struct Ints {sum: ~int, values: ~[int]}
 
 fn add_int(x: &mut Ints, v: int) {
     *x.sum += v;
     let mut values = ~[];
-    util::swap(&mut values, &mut x.values);
+    swap(&mut values, &mut x.values);
     values.push(v);
-    util::swap(&mut values, &mut x.values);
+    swap(&mut values, &mut x.values);
 }
 
 fn iter_ints(x: &Ints, f: |x: &int| -> bool) -> bool {
diff --git a/src/test/run-pass/import-in-block.rs b/src/test/run-pass/import-in-block.rs
index 0d539655148..7c0037c1e15 100644
--- a/src/test/run-pass/import-in-block.rs
+++ b/src/test/run-pass/import-in-block.rs
@@ -11,11 +11,11 @@
 #[feature(globs)];
 
 pub fn main() {
-    use std::util::replace;
+    use std::mem::replace;
     let mut x = 5;
     replace(&mut x, 6);
     {
-        use std::util::*;
+        use std::mem::*;
         let mut y = 6;
         swap(&mut x, &mut y);
     }
diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs
index 2c18361fd46..79d25787808 100644
--- a/src/test/run-pass/issue-2718.rs
+++ b/src/test/run-pass/issue-2718.rs
@@ -17,8 +17,8 @@ pub mod pipes {
     use super::Task;
     use std::cast::{forget, transmute};
     use std::cast;
+    use std::mem::{replace, swap};
     use std::task;
-    use std::util;
 
     pub struct Stuff<T> {
         state: state,
@@ -111,7 +111,7 @@ pub mod pipes {
             match old_state {
               empty | blocked => { task::deschedule(); }
               full => {
-                let payload = util::replace(&mut p.payload, None);
+                let payload = replace(&mut p.payload, None);
                 return Some(payload.unwrap())
               }
               terminated => {
@@ -167,7 +167,7 @@ pub mod pipes {
                 if self.p != None {
                     let self_p: &mut Option<*packet<T>> =
                         cast::transmute(&self.p);
-                    let p = util::replace(self_p, None);
+                    let p = replace(self_p, None);
                     sender_terminate(p.unwrap())
                 }
             }
@@ -176,7 +176,7 @@ pub mod pipes {
 
     impl<T:Send> send_packet<T> {
         pub fn unwrap(&mut self) -> *packet<T> {
-            util::replace(&mut self.p, None).unwrap()
+            replace(&mut self.p, None).unwrap()
         }
     }
 
@@ -197,7 +197,7 @@ pub mod pipes {
                 if self.p != None {
                     let self_p: &mut Option<*packet<T>> =
                         cast::transmute(&self.p);
-                    let p = util::replace(self_p, None);
+                    let p = replace(self_p, None);
                     receiver_terminate(p.unwrap())
                 }
             }
@@ -206,7 +206,7 @@ pub mod pipes {
 
     impl<T:Send> recv_packet<T> {
         pub fn unwrap(&mut self) -> *packet<T> {
-            util::replace(&mut self.p, None).unwrap()
+            replace(&mut self.p, None).unwrap()
         }
     }
 
diff --git a/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs b/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs
index 6284130de17..18458aa2320 100644
--- a/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs
+++ b/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::util;
+use std::mem::swap;
 
 pub fn main() {
     let mut x = 4;
@@ -26,6 +26,6 @@ pub fn main() {
             }
         }
         let mut y = 4;
-        util::swap(&mut y, &mut x);
+        swap(&mut y, &mut x);
     }
 }
diff --git a/src/test/run-pass/swap-1.rs b/src/test/run-pass/swap-1.rs
index 1c0c05cc16d..82a76512e08 100644
--- a/src/test/run-pass/swap-1.rs
+++ b/src/test/run-pass/swap-1.rs
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::util;
+use std::mem::swap;
 
 pub fn main() {
     let mut x = 3; let mut y = 7;
-    util::swap(&mut x, &mut y);
+    swap(&mut x, &mut y);
     assert!((x == 7)); assert!((y == 3));
 }
diff --git a/src/test/run-pass/swap-2.rs b/src/test/run-pass/swap-2.rs
index 2ec2eb3c45b..208700fde8a 100644
--- a/src/test/run-pass/swap-2.rs
+++ b/src/test/run-pass/swap-2.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::util;
+use std::mem::swap;
 
 pub fn main() {
     let mut a: ~[int] = ~[0, 1, 2, 3, 4, 5, 6];
@@ -16,7 +16,7 @@ pub fn main() {
     assert_eq!(a[2], 4);
     assert_eq!(a[4], 2);
     let mut n = 42;
-    util::swap(&mut n, &mut a[0]);
+    swap(&mut n, &mut a[0]);
     assert_eq!(a[0], 42);
     assert_eq!(n, 0);
 }
diff --git a/src/test/run-pass/unique-swap.rs b/src/test/run-pass/unique-swap.rs
index a372e4a4d98..779606dba0c 100644
--- a/src/test/run-pass/unique-swap.rs
+++ b/src/test/run-pass/unique-swap.rs
@@ -8,12 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::util;
+use std::mem::swap;
 
 pub fn main() {
     let mut i = ~100;
     let mut j = ~200;
-    util::swap(&mut i, &mut j);
+    swap(&mut i, &mut j);
     assert_eq!(i, ~200);
     assert_eq!(j, ~100);
 }
diff --git a/src/test/run-pass/weird-exprs.rs b/src/test/run-pass/weird-exprs.rs
index f62ab6f59a0..10726a9c396 100644
--- a/src/test/run-pass/weird-exprs.rs
+++ b/src/test/run-pass/weird-exprs.rs
@@ -11,7 +11,7 @@
 #[feature(managed_boxes)];
 
 use std::cell::Cell;
-use std::util;
+use std::mem::swap;
 
 // Just a grab bag of stuff that you wouldn't want to actually write.
 
@@ -59,7 +59,7 @@ fn notsure() {
     let mut _y = (_x = 0) == (_x = 0);
     let mut _z = (_x = 0) < (_x = 0);
     let _a = (_x += 0) == (_x = 0);
-    let _b = util::swap(&mut _y, &mut _z) == util::swap(&mut _y, &mut _z);
+    let _b = swap(&mut _y, &mut _z) == swap(&mut _y, &mut _z);
 }
 
 fn canttouchthis() -> uint {