test: Update tests to use the new syntax.

Author: pcwalton

src/test/auxiliary/cci_capture_clause.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::comm::*;
+use std::comm::*;
 
 pub fn foo<T:Owned + Copy>(x: T) -> Port<T> {
     let (p, c) = stream();

src/test/auxiliary/cci_class_cast.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::to_str::*;
+use std::to_str::*;
 
 pub mod kitty {
     pub struct cat {

src/test/auxiliary/issue-2526.rs

@@ -13,7 +13,7 @@
        uuid = "54cc1bc9-02b8-447c-a227-75ebc923bc29")];
 #[crate_type = "lib"];
 
-extern mod std;
+extern mod extra;
 
 struct arc_destruct<T> {
   _data: int,

src/test/auxiliary/issue-2631-a.rs

@@ -11,9 +11,9 @@
 #[link(name = "req")];
 #[crate_type = "lib"];
 
-extern mod std;
+extern mod extra;
 
-use core::hashmap::HashMap;
+use std::hashmap::HashMap;
 
 pub type header_map = HashMap<~str, @mut ~[@~str]>;
 

src/test/auxiliary/trait_inheritance_overloading_xc.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cmp::Eq;
+use std::cmp::Eq;
 
 pub trait MyNum : Add<Self,Self> + Sub<Self,Self> + Mul<Self,Self> + Eq {
 }

src/test/bench/core-map.rs

@@ -8,14 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
-use core::io;
-use std::time;
-use std::treemap::TreeMap;
-use core::hashmap::{HashMap, HashSet};
-use core::trie::TrieMap;
-use core::rand::Rng;
+use std::io;
+use extra::time;
+use extra::treemap::TreeMap;
+use std::hashmap::{HashMap, HashSet};
+use std::trie::TrieMap;
+use std::rand::Rng;
 
 fn timed(label: &str, f: &fn()) {
     let start = time::precise_time_s();
@@ -103,7 +103,7 @@ fn main() {
     let mut rand = vec::with_capacity(n_keys);
 
     {
-        let mut rng = core::rand::IsaacRng::new_seeded([1, 1, 1, 1, 1, 1, 1]);
+        let mut rng = std::rand::IsaacRng::new_seeded([1, 1, 1, 1, 1, 1, 1]);
         let mut set = HashSet::new();
         while set.len() != n_keys {
             let next = rng.next() as uint;

src/test/bench/core-set.rs

@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use core::hashmap::HashSet;
-use std::bitv::BitvSet;
-use std::treemap::TreeSet;
+extern mod extra;
+use std::hashmap::HashSet;
+use extra::bitv::BitvSet;
+use extra::treemap::TreeSet;
 
 struct Results {
     sequential_ints: float,
@@ -24,9 +24,9 @@ struct Results {
 }
 
 fn timed(result: &mut float, op: &fn()) {
-    let start = std::time::precise_time_s();
+    let start = extra::time::precise_time_s();
     op();
-    let end = std::time::precise_time_s();
+    let end = extra::time::precise_time_s();
     *result = (end - start);
 }
 
@@ -168,21 +168,21 @@ fn main() {
         let mut results = empty_results();
         results.bench_int(&mut rng, num_keys, max, || HashSet::new::<uint>());
         results.bench_str(&mut rng, num_keys, || HashSet::new::<~str>());
-        write_results("core::hashmap::HashSet", &results);
+        write_results("std::hashmap::HashSet", &results);
     }
 
     {
         let mut rng = rand::IsaacRng::new_seeded(seed);
         let mut results = empty_results();
         results.bench_int(&mut rng, num_keys, max, || TreeSet::new::<uint>());
         results.bench_str(&mut rng, num_keys, || TreeSet::new::<~str>());
-        write_results("std::treemap::TreeSet", &results);
+        write_results("extra::treemap::TreeSet", &results);
     }
 
     {
         let mut rng = rand::IsaacRng::new_seeded(seed);
         let mut results = empty_results();
         results.bench_int(&mut rng, num_keys, max, || BitvSet::new());
-        write_results("std::bitv::BitvSet", &results);
+        write_results("extra::bitv::BitvSet", &results);
     }
 }

src/test/bench/core-std.rs

@@ -8,13 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Microbenchmarks for various functions in core and std
+// Microbenchmarks for various functions in std and extra
 
-extern mod std;
+extern mod extra;
 
-use std::time::precise_time_s;
-use core::rand::RngUtil;
-use core::util;
+use extra::time::precise_time_s;
+use std::rand::RngUtil;
+use std::util;
 
 macro_rules! bench (
     ($id:ident) => (maybe_run_test(argv, stringify!($id).to_owned(), $id))

src/test/bench/graph500-bfs.rs

@@ -16,14 +16,14 @@ An implementation of the Graph500 Breadth First Search problem in Rust.
 
 */
 
-extern mod std;
-use std::arc;
-use std::time;
-use std::deque::Deque;
-use std::par;
-use core::hashmap::HashSet;
-use core::int::abs;
-use core::rand::RngUtil;
+extern mod extra;
+use extra::arc;
+use extra::time;
+use extra::deque::Deque;
+use extra::par;
+use std::hashmap::HashSet;
+use std::int::abs;
+use std::rand::RngUtil;
 
 type node_id = i64;
 type graph = ~[~[node_id]];

src/test/bench/msgsend-pipes-shared.rs

@@ -18,11 +18,11 @@
 // different scalability characteristics compared to the select
 // version.
 
-extern mod std;
-use core::io::Writer;
-use core::io::WriterUtil;
+extern mod extra;
+use std::io::Writer;
+use std::io::WriterUtil;
 
-use core::comm::{Port, Chan, SharedChan};
+use std::comm::{Port, Chan, SharedChan};
 
 macro_rules! move_out (
     { $x:expr } => { unsafe { let y = *ptr::to_unsafe_ptr(&($x)); y } }
@@ -61,7 +61,7 @@ fn run(args: &[~str]) {
     let size = uint::from_str(args[1]).get();
     let workers = uint::from_str(args[2]).get();
     let num_bytes = 100;
-    let start = std::time::precise_time_s();
+    let start = extra::time::precise_time_s();
     let mut worker_results = ~[];
     for uint::range(0, workers) |_i| {
         let to_child = to_child.clone();
@@ -87,7 +87,7 @@ fn run(args: &[~str]) {
     to_child.send(stop);
     move_out!(to_child);
     let result = from_child.recv();
-    let end = std::time::precise_time_s();
+    let end = extra::time::precise_time_s();
     let elapsed = end - start;
     io::stdout().write_str(fmt!("Count is %?\n", result));
     io::stdout().write_str(fmt!("Test took %? seconds\n", elapsed));