test: Update tests to use the new syntax.

author: Patrick Walton <pcwalton@mimiga.net> 2013-05-20 17:07:24 -0700
committer: Patrick Walton <pcwalton@mimiga.net> 2013-05-22 21:57:10 -0700
commit: 1be40be613177d4849f42da284a3af74e1d58da2 (patch)
tree: e0e9563c7648966ed6d0a620d7829d52ea3fa9f0
parent: c10e0cb9c984ece484a5c8c9c4c20369e2be499b (diff)
download: rust-1be40be613177d4849f42da284a3af74e1d58da2.tar.gz
rust-1be40be613177d4849f42da284a3af74e1d58da2.zip
272 files changed, 565 insertions, 565 deletions
diff --git a/src/test/auxiliary/cci_capture_clause.rs b/src/test/auxiliary/cci_capture_clause.rs
index f2749ed1d0c..13cc27e0e27 100644
--- a/src/test/auxiliary/cci_capture_clause.rs
+++ b/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();
diff --git a/src/test/auxiliary/cci_class_cast.rs b/src/test/auxiliary/cci_class_cast.rs
index ae0407a5bed..56808b0d58f 100644
--- a/src/test/auxiliary/cci_class_cast.rs
+++ b/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 {
diff --git a/src/test/auxiliary/issue-2526.rs b/src/test/auxiliary/issue-2526.rs
index 0e9cf39929f..bbc0f1ad3e5 100644
--- a/src/test/auxiliary/issue-2526.rs
+++ b/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,
diff --git a/src/test/auxiliary/issue-2631-a.rs b/src/test/auxiliary/issue-2631-a.rs
index bee754f5bd4..8afc0327755 100644
--- a/src/test/auxiliary/issue-2631-a.rs
+++ b/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]>;
 
diff --git a/src/test/auxiliary/trait_inheritance_overloading_xc.rs b/src/test/auxiliary/trait_inheritance_overloading_xc.rs
index 1fb0db25b31..f938c9c56ed 100644
--- a/src/test/auxiliary/trait_inheritance_overloading_xc.rs
+++ b/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 {
 }
diff --git a/src/test/bench/core-map.rs b/src/test/bench/core-map.rs
index 0d951771d70..7904041ea3c 100644
--- a/src/test/bench/core-map.rs
+++ b/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;
diff --git a/src/test/bench/core-set.rs b/src/test/bench/core-set.rs
index bae21c6d4a3..86215e609ee 100644
--- a/src/test/bench/core-set.rs
+++ b/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,7 +168,7 @@ 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);
     }
 
     {
@@ -176,13 +176,13 @@ fn main() {
         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);
     }
 }
diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs
index e6b3b3bbe20..024d4a02897 100644
--- a/src/test/bench/core-std.rs
+++ b/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))
diff --git a/src/test/bench/graph500-bfs.rs b/src/test/bench/graph500-bfs.rs
index 4be2cca0b48..734b5a0006f 100644
--- a/src/test/bench/graph500-bfs.rs
+++ b/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]];
diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs
index d1be03e944a..e041f607057 100644
--- a/src/test/bench/msgsend-pipes-shared.rs
+++ b/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));
diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs
index b72a38d4054..a854de0a828 100644
--- a/src/test/bench/msgsend-pipes.rs
+++ b/src/test/bench/msgsend-pipes.rs
@@ -14,11 +14,11 @@
 //
 // I *think* it's the same, more or less.
 
-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, PortSet, Chan, stream};
+use std::comm::{Port, PortSet, Chan, stream};
 
 macro_rules! move_out (
     { $x:expr } => { unsafe { let y = *ptr::to_unsafe_ptr(&($x)); y } }
@@ -57,7 +57,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 (from_parent_, to_child) = stream();
@@ -84,7 +84,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));
diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs
index 2d234634cc8..ffca59e3e8f 100644
--- a/src/test/bench/msgsend-ring-mutex-arcs.rs
+++ b/src/test/bench/msgsend-ring-mutex-arcs.rs
@@ -15,11 +15,11 @@
 
 // This also serves as a pipes test, because ARCs are implemented with pipes.
 
-extern mod std;
-use std::time;
-use std::arc;
-use std::future;
-use core::cell::Cell;
+extern mod extra;
+use extra::time;
+use extra::arc;
+use extra::future;
+use std::cell::Cell;
 
 // A poor man's pipe.
 type pipe = arc::MutexARC<~[uint]>;
diff --git a/src/test/bench/msgsend-ring-pipes.rs b/src/test/bench/msgsend-ring-pipes.rs
index f698b2c3c11..7b6e94fa10b 100644
--- a/src/test/bench/msgsend-ring-pipes.rs
+++ b/src/test/bench/msgsend-ring-pipes.rs
@@ -16,13 +16,13 @@
 
 // This version uses automatically compiled channel contracts.
 
-extern mod std;
+extern mod extra;
 
-use core::cell::Cell;
-use core::pipes::recv;
-use core::util;
-use std::time;
-use std::future;
+use std::cell::Cell;
+use std::pipes::recv;
+use std::util;
+use extra::time;
+use extra::future;
 
 proto! ring (
     num:send {
diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs
index 02415c4bcfc..78f7c02a40b 100644
--- a/src/test/bench/msgsend-ring-rw-arcs.rs
+++ b/src/test/bench/msgsend-ring-rw-arcs.rs
@@ -15,12 +15,12 @@
 
 // This also serves as a pipes test, because ARCs are implemented with pipes.
 
-extern mod std;
+extern mod extra;
 
-use core::cell::Cell;
-use std::time;
-use std::arc;
-use std::future;
+use std::cell::Cell;
+use extra::time;
+use extra::arc;
+use extra::future;
 
 // A poor man's pipe.
 type pipe = arc::RWARC<~[uint]>;
diff --git a/src/test/bench/noise.rs b/src/test/bench/noise.rs
index 992ce73a4bf..cf1eae3d37b 100644
--- a/src/test/bench/noise.rs
+++ b/src/test/bench/noise.rs
@@ -1,6 +1,6 @@
 // Perlin noise benchmark from https://gist.github.com/1170424
 
-use core::rand::{Rng, RngUtil};
+use std::rand::{Rng, RngUtil};
 
 struct Vec2 {
     x: f32,
diff --git a/src/test/bench/pingpong.rs b/src/test/bench/pingpong.rs
index cfad253cfed..970a970feb1 100644
--- a/src/test/bench/pingpong.rs
+++ b/src/test/bench/pingpong.rs
@@ -12,11 +12,11 @@
 
 // xfail-pretty
 
-extern mod std;
+extern mod extra;
 
-use core::cell::Cell;
-use core::pipes::*;
-use std::time::precise_time_s;
+use std::cell::Cell;
+use std::pipes::*;
+use extra::time::precise_time_s;
 
 proto! pingpong (
     ping: send {
@@ -117,10 +117,10 @@ pub fn spawn_service_recv<T:Owned,Tb:Owned>(
     client
 }
 
-fn switch<T:Owned,Tb:Owned,U>(endp: core::pipes::RecvPacketBuffered<T, Tb>,
+fn switch<T:Owned,Tb:Owned,U>(endp: std::pipes::RecvPacketBuffered<T, Tb>,
                               f: &fn(v: Option<T>) -> U)
                               -> U {
-    f(core::pipes::try_recv(endp))
+    f(std::pipes::try_recv(endp))
 }
 
 // Here's the benchmark
diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout-ackermann.rs
index c8ffad025fa..4a811305679 100644
--- a/src/test/bench/shootout-ackermann.rs
+++ b/src/test/bench/shootout-ackermann.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 fn ack(m: int, n: int) -> int {
     if m == 0 {
diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs
index c420e0cbb2f..e7aed911cb0 100644
--- a/src/test/bench/shootout-binarytrees.rs
+++ b/src/test/bench/shootout-binarytrees.rs
@@ -12,8 +12,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::arena;
+extern mod extra;
+use extra::arena;
 
 enum tree<'self> {
     nil,
diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout-chameneos-redux.rs
index 03d45252432..0ccb9a16ada 100644
--- a/src/test/bench/shootout-chameneos-redux.rs
+++ b/src/test/bench/shootout-chameneos-redux.rs
@@ -10,10 +10,10 @@
 
 // chameneos
 
-extern mod std;
-use std::sort;
-use core::cell::Cell;
-use core::comm::*;
+extern mod extra;
+use extra::sort;
+use std::cell::Cell;
+use std::comm::*;
 
 fn print_complements() {
     let all = ~[Blue, Red, Yellow];
diff --git a/src/test/bench/shootout-fannkuch-redux.rs b/src/test/bench/shootout-fannkuch-redux.rs
index cb32e0e496e..a65bfe228b2 100644
--- a/src/test/bench/shootout-fannkuch-redux.rs
+++ b/src/test/bench/shootout-fannkuch-redux.rs
@@ -1,6 +1,6 @@
-use core::from_str::FromStr;
-use core::i32::range;
-use core::vec::MutableVector;
+use std::from_str::FromStr;
+use std::i32::range;
+use std::vec::MutableVector;
 
 fn max(a: i32, b: i32) -> i32 {
     if a > b {
diff --git a/src/test/bench/shootout-fasta-redux.rs b/src/test/bench/shootout-fasta-redux.rs
index d6a0f4b8b25..840f6fdb17b 100644
--- a/src/test/bench/shootout-fasta-redux.rs
+++ b/src/test/bench/shootout-fasta-redux.rs
@@ -1,8 +1,8 @@
-use core::cast::transmute;
-use core::from_str::FromStr;
-use core::libc::{FILE, STDOUT_FILENO, c_int, fdopen, fputc, fputs, fwrite, size_t};
-use core::uint::{min, range};
-use core::vec::bytes::copy_memory;
+use std::cast::transmute;
+use std::from_str::FromStr;
+use std::libc::{FILE, STDOUT_FILENO, c_int, fdopen, fputc, fputs, fwrite, size_t};
+use std::uint::{min, range};
+use std::vec::bytes::copy_memory;
 
 static LINE_LEN: uint = 60;
 static LOOKUP_SIZE: uint = 4 * 1024;
diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout-fasta.rs
index 7316b68f8bd..f3de8bf01e9 100644
--- a/src/test/bench/shootout-fasta.rs
+++ b/src/test/bench/shootout-fasta.rs
@@ -15,8 +15,8 @@
  * Computer Language Benchmarks Game
  * http://shootout.alioth.debian.org/
  */
-extern mod std;
-use core::rand::Rng;
+extern mod extra;
+use std::rand::Rng;
 
 fn LINE_LENGTH() -> uint { return 60u; }
 
diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs
index b080aded8c4..cfb8e0fe7c9 100644
--- a/src/test/bench/shootout-fibo.rs
+++ b/src/test/bench/shootout-fibo.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 fn fib(n: int) -> int {
     if n < 2 {
diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs
index 3c32ec338b7..e0ffd3e4133 100644
--- a/src/test/bench/shootout-k-nucleotide-pipes.rs
+++ b/src/test/bench/shootout-k-nucleotide-pipes.rs
@@ -11,13 +11,13 @@
 // xfail-pretty (extra blank line is inserted in vec::mapi call)
 // multi tasking k-nucleotide
 
-extern mod std;
-use std::sort;
-use core::hashmap::HashMap;
-use core::io::ReaderUtil;
-use core::comm::{stream, Port, Chan};
-use core::cmp::Ord;
-use core::util;
+extern mod extra;
+use extra::sort;
+use std::hashmap::HashMap;
+use std::io::ReaderUtil;
+use std::comm::{stream, Port, Chan};
+use std::cmp::Ord;
+use std::util;
 
 // given a map, print a sorted version of it
 fn sort_and_fmt(mm: &HashMap<~[u8], uint>, total: uint) -> ~str {
diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs
index 1791af67ed0..a70e0730073 100644
--- a/src/test/bench/shootout-k-nucleotide.rs
+++ b/src/test/bench/shootout-k-nucleotide.rs
@@ -1,15 +1,15 @@
 // xfail-test
 
-extern mod std;
-
-use core::cast::transmute;
-use core::i32::range;
-use core::libc::{STDIN_FILENO, c_int, fdopen, fgets, fileno, fopen, fstat};
-use core::libc::{stat, strlen};
-use core::ptr::null;
-use core::unstable::intrinsics::init;
-use core::vec::{reverse, slice};
-use std::sort::quick_sort3;
+extern mod extra;
+
+use std::cast::transmute;
+use std::i32::range;
+use std::libc::{STDIN_FILENO, c_int, fdopen, fgets, fileno, fopen, fstat};
+use std::libc::{stat, strlen};
+use std::ptr::null;
+use std::unstable::intrinsics::init;
+use std::vec::{reverse, slice};
+use extra::sort::quick_sort3;
 
 static LINE_LEN: uint = 80;
 static TABLE: [u8, ..4] = [ 'A' as u8, 'C' as u8, 'G' as u8, 'T' as u8 ];
diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs
index 7d2b25792ec..d4c3862fd7e 100644
--- a/src/test/bench/shootout-mandelbrot.rs
+++ b/src/test/bench/shootout-mandelbrot.rs
@@ -1,7 +1,7 @@
-use core::cast::transmute;
-use core::from_str::FromStr;
-use core::i32::range;
-use core::libc::{STDOUT_FILENO, c_int, fdopen, fputc};
+use std::cast::transmute;
+use std::from_str::FromStr;
+use std::i32::range;
+use std::libc::{STDOUT_FILENO, c_int, fdopen, fputc};
 
 static ITER: uint = 50;
 static LIMIT: f64 = 2.0;
diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs
index da06b36af67..a226d50dc27 100644
--- a/src/test/bench/shootout-nbody.rs
+++ b/src/test/bench/shootout-nbody.rs
@@ -1,5 +1,5 @@
-use core::from_str::FromStr;
-use core::uint::range;
+use std::from_str::FromStr;
+use std::uint::range;
 
 static PI: f64 = 3.141592653589793;
 static SOLAR_MASS: f64 = 4.0 * PI * PI;
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index 31945310eb3..e201438a6ef 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -19,14 +19,14 @@
 
 */
 
-extern mod std;
+extern mod extra;
 
-use std::{time, getopts};
-use core::int::range;
-use core::comm::*;
-use core::io::WriterUtil;
+use extra::{time, getopts};
+use std::int::range;
+use std::comm::*;
+use std::io::WriterUtil;
 
-use core::result::{Ok, Err};
+use std::result::{Ok, Err};
 
 fn fib(n: int) -> int {
     fn pfib(c: &Chan<int>, n: int) {
diff --git a/src/test/bench/shootout-pidigits.rs b/src/test/bench/shootout-pidigits.rs
index cb7fa969be7..e84a4ea4327 100644
--- a/src/test/bench/shootout-pidigits.rs
+++ b/src/test/bench/shootout-pidigits.rs
@@ -1,10 +1,10 @@
 // xfail-test
 
-use core::cast::transmute;
-use core::from_str::FromStr;
-use core::libc::{STDOUT_FILENO, c_char, c_int, c_uint, c_void, fdopen, fputc};
-use core::libc::{fputs};
-use core::ptr::null;
+use std::cast::transmute;
+use std::from_str::FromStr;
+use std::libc::{STDOUT_FILENO, c_char, c_int, c_uint, c_void, fdopen, fputc};
+use std::libc::{fputs};
+use std::ptr::null;
 
 struct mpz_t {
     _mp_alloc: c_int,
diff --git a/src/test/bench/shootout-reverse-complement.rs b/src/test/bench/shootout-reverse-complement.rs
index a9cb3c7636a..9893785ecfa 100644
--- a/src/test/bench/shootout-reverse-complement.rs
+++ b/src/test/bench/shootout-reverse-complement.rs
@@ -1,12 +1,12 @@
 // xfail-pretty
 // xfail-test
 
-use core::cast::transmute;
-use core::libc::{STDOUT_FILENO, c_int, fdopen, fgets, fopen, fputc, fwrite};
-use core::libc::{size_t};
-use core::ptr::null;
-use core::vec::{capacity, reserve, reserve_at_least};
-use core::vec::raw::set_len;
+use std::cast::transmute;
+use std::libc::{STDOUT_FILENO, c_int, fdopen, fgets, fopen, fputc, fwrite};
+use std::libc::{size_t};
+use std::ptr::null;
+use std::vec::{capacity, reserve, reserve_at_least};
+use std::vec::raw::set_len;
 
 static LINE_LEN: u32 = 80;
 
diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout-spectralnorm.rs
index 6840384ca7c..a3beee7c90d 100644
--- a/src/test/bench/shootout-spectralnorm.rs
+++ b/src/test/bench/shootout-spectralnorm.rs
@@ -1,5 +1,5 @@
-use core::from_str::FromStr;
-use core::iter::ExtendedMutableIter;
+use std::from_str::FromStr;
+use std::iter::ExtendedMutableIter;
 
 #[inline]
 fn A(i: i32, j: i32) -> i32 {
diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs
index 7b8aca2694e..f1cd05e1d9e 100644
--- a/src/test/bench/std-smallintmap.rs
+++ b/src/test/bench/std-smallintmap.rs
@@ -10,9 +10,9 @@
 
 // Microbenchmark for the smallintmap library
 
-extern mod std;
-use std::smallintmap::SmallIntMap;
-use core::io::WriterUtil;
+extern mod extra;
+use extra::smallintmap::SmallIntMap;
+use std::io::WriterUtil;
 
 fn append_sequential(min: uint, max: uint, map: &mut SmallIntMap<uint>) {
     for uint::range(min, max) |i| {
@@ -43,11 +43,11 @@ fn main() {
 
     for uint::range(0u, rep) |_r| {
         let mut map = SmallIntMap::new();
-        let start = std::time::precise_time_s();
+        let start = extra::time::precise_time_s();
         append_sequential(0u, max, &mut map);
-        let mid = std::time::precise_time_s();
+        let mid = extra::time::precise_time_s();
         check_sequential(0u, max, &map);
-        let end = std::time::precise_time_s();
+        let end = extra::time::precise_time_s();
 
         checkf += (end - mid) as float;
         appendf += (mid - start) as float;
diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs
index 4d8614b5edd..e3f02684bb0 100644
--- a/src/test/bench/sudoku.rs
+++ b/src/test/bench/sudoku.rs
@@ -10,11 +10,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
-use core::io::{ReaderUtil, WriterUtil};
-use core::io;
-use core::unstable::intrinsics::cttz16;
+use std::io::{ReaderUtil, WriterUtil};
+use std::io;
+use std::unstable::intrinsics::cttz16;
 
 // Computes a single solution to a given 9x9 sudoku
 //
diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/task-perf-alloc-unwind.rs
index 4a07193d8cd..a6d94c75354 100644
--- a/src/test/bench/task-perf-alloc-unwind.rs
+++ b/src/test/bench/task-perf-alloc-unwind.rs
@@ -10,10 +10,10 @@
 
 // xfail-win32
 
-extern mod std;
+extern mod extra;
 
-use std::list::{List, Cons, Nil};
-use std::time::precise_time_s;
+use extra::list::{List, Cons, Nil};
+use extra::time::precise_time_s;
 
 enum UniqueList {
     ULNil, ULCons(~UniqueList)
diff --git a/src/test/bench/task-perf-jargon-metal-smoke.rs b/src/test/bench/task-perf-jargon-metal-smoke.rs
index a6eaf892310..4600cf46892 100644
--- a/src/test/bench/task-perf-jargon-metal-smoke.rs
+++ b/src/test/bench/task-perf-jargon-metal-smoke.rs
@@ -17,7 +17,7 @@
 //
 // The filename is a song reference; google it in quotes.
 
-use core::cell::Cell;
+use std::cell::Cell;
 
 fn child_generation(gens_left: uint, c: comm::Chan<()>) {
     // This used to be O(n^2) in the number of generations that ever existed.
diff --git a/src/test/bench/task-perf-linked-failure.rs b/src/test/bench/task-perf-linked-failure.rs
index aacdf678bbf..b8cba98c6fb 100644
--- a/src/test/bench/task-perf-linked-failure.rs
+++ b/src/test/bench/task-perf-linked-failure.rs
@@ -22,7 +22,7 @@
 // Creates in the background 'num_tasks' tasks, all blocked forever.
 // Doesn't return until all such tasks are ready, but doesn't block forever itself.
 
-use core::comm::*;
+use std::comm::*;
 
 fn grandchild_group(num_tasks: uint) {
     let (po, ch) = stream();
diff --git a/src/test/bench/task-perf-one-million.rs b/src/test/bench/task-perf-one-million.rs
index 8e1cbb9e17b..56e981b735d 100644
--- a/src/test/bench/task-perf-one-million.rs
+++ b/src/test/bench/task-perf-one-million.rs
@@ -10,7 +10,7 @@
 
 // Test for concurrent tasks
 
-use core::comm::*;
+use std::comm::*;
 
 fn calc(children: uint, parent_wait_chan: &Chan<Chan<Chan<int>>>) {
 
diff --git a/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs b/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs
index 7806436ef83..3dafb076afe 100644
--- a/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs
+++ b/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs
@@ -10,8 +10,8 @@
 
 // xfail-test
 // error-pattern: instantiating a type parameter with an incompatible type
-extern mod std;
-use std::arc::rw_arc;
+extern mod extra;
+use extra::arc::rw_arc;
 
 fn main() {
     let arc1  = ~rw_arc(true);
diff --git a/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs
index f59eb509156..82868647e57 100644
--- a/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs
+++ b/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // error-pattern: reference is not valid outside of its lifetime
-extern mod std;
-use std::arc;
+extern mod extra;
+use extra::arc;
 fn main() {
     let x = ~arc::RWARC(1);
     let mut y = None;
diff --git a/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs
index 85f60f34bdb..6d4b774fd5f 100644
--- a/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs
+++ b/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::arc;
+extern mod extra;
+use extra::arc;
 fn main() {
     let x = ~arc::RWARC(1);
     let mut y = None;
diff --git a/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs
index 22f5a8eac03..6bd32866f89 100644
--- a/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs
+++ b/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // error-pattern: reference is not valid outside of its lifetime
-extern mod std;
-use std::arc;
+extern mod extra;
+use extra::arc;
 fn main() {
     let x = ~arc::RWARC(1);
     let mut y = None;
diff --git a/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs
index c8273cb0167..53447531903 100644
--- a/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs
+++ b/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // error-pattern: reference is not valid outside of its lifetime
-extern mod std;
-use std::arc;
+extern mod extra;
+use extra::arc;
 fn main() {
     let x = ~arc::RWARC(1);
     let mut y = None;
diff --git a/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs
index c7ae6a0dc6c..decb7b8af9f 100644
--- a/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs
+++ b/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // error-pattern: reference is not valid outside of its lifetime
-extern mod std;
-use std::arc;
+extern mod extra;
+use extra::arc;
 fn main() {
     let x = ~arc::RWARC(1);
     let mut y = None;
diff --git a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs b/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs
index 887cb59930e..bd87a57af25 100644
--- a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs
+++ b/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs
@@ -10,7 +10,7 @@
 
 //buggy.rs
 
-use core::hashmap::HashMap;
+use std::hashmap::HashMap;
 
 fn main() {
     let mut buggy_map :HashMap<uint, &uint> =
diff --git a/src/test/compile-fail/borrowck-insert-during-each.rs b/src/test/compile-fail/borrowck-insert-during-each.rs
index 109753b38e7..c9bd7503969 100644
--- a/src/test/compile-fail/borrowck-insert-during-each.rs
+++ b/src/test/compile-fail/borrowck-insert-during-each.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::hashmap::HashSet;
+use std::hashmap::HashSet;
 
 struct Foo {
   n: HashSet<int>,
diff --git a/src/test/compile-fail/borrowck-loan-local-as-both-mut-and-imm.rs b/src/test/compile-fail/borrowck-loan-local-as-both-mut-and-imm.rs
index 6e8e3da143e..9ea4fe8aef4 100644
--- a/src/test/compile-fail/borrowck-loan-local-as-both-mut-and-imm.rs
+++ b/src/test/compile-fail/borrowck-loan-local-as-both-mut-and-imm.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::either::{Either, Left, Right};
+use std::either::{Either, Left, Right};
 
     fn f(x: &mut Either<int,float>, y: &Either<int,float>) -> int {
         match *y {
diff --git a/src/test/compile-fail/borrowck-move-by-capture.rs b/src/test/compile-fail/borrowck-move-by-capture.rs
index c199c879575..4e977442e15 100644
--- a/src/test/compile-fail/borrowck-move-by-capture.rs
+++ b/src/test/compile-fail/borrowck-move-by-capture.rs
@@ -1,4 +1,4 @@
-extern mod std;
+extern mod extra;
 
 fn main() {
     let foo = ~3;
diff --git a/src/test/compile-fail/borrowck-vec-pattern-move-tail.rs b/src/test/compile-fail/borrowck-vec-pattern-move-tail.rs
index 2898e312930..db8127d0854 100644
--- a/src/test/compile-fail/borrowck-vec-pattern-move-tail.rs
+++ b/src/test/compile-fail/borrowck-vec-pattern-move-tail.rs
@@ -2,7 +2,7 @@ fn main() {
     let mut a = [1, 2, 3, 4];
     let t = match a {
         [1, 2, ..tail] => tail,
-        _ => core::util::unreachable()
+        _ => std::util::unreachable()
     };
     a[0] = 0; //~ ERROR cannot assign to `a[]` because it is borrowed
     t[0];
diff --git a/src/test/compile-fail/core-tls-store-pointer.rs b/src/test/compile-fail/core-tls-store-pointer.rs
index fcb25069de6..63bbaf80177 100644
--- a/src/test/compile-fail/core-tls-store-pointer.rs
+++ b/src/test/compile-fail/core-tls-store-pointer.rs
@@ -10,7 +10,7 @@
 
 // Testing that we can't store a borrowed pointer it task-local storage
 
-use core::local_data::*;
+use std::local_data::*;
 
 fn key(_x: @&int) { }
 
diff --git a/src/test/compile-fail/extfmt-not-enough-args.rs b/src/test/compile-fail/extfmt-not-enough-args.rs
index 5f078a288d9..f18ae748ee0 100644
--- a/src/test/compile-fail/extfmt-not-enough-args.rs
+++ b/src/test/compile-fail/extfmt-not-enough-args.rs
@@ -10,6 +10,6 @@
 
 // error-pattern:not enough arguments
 
-extern mod std;
+extern mod extra;
 
 fn main() { let s = fmt!("%s%s%s", "test", "test"); }
diff --git a/src/test/compile-fail/extfmt-too-many-args.rs b/src/test/compile-fail/extfmt-too-many-args.rs
index 3a16db6638b..2a72dcf8988 100644
--- a/src/test/compile-fail/extfmt-too-many-args.rs
+++ b/src/test/compile-fail/extfmt-too-many-args.rs
@@ -10,6 +10,6 @@
 
 // error-pattern:too many arguments
 
-extern mod std;
+extern mod extra;
 
 fn main() { let s = fmt!("%s", "test", "test"); }
diff --git a/src/test/compile-fail/fail-expr.rs b/src/test/compile-fail/fail-expr.rs
index e17c8d6a182..98270bdc583 100644
--- a/src/test/compile-fail/fail-expr.rs
+++ b/src/test/compile-fail/fail-expr.rs
@@ -8,6 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:failed to find an implementation of trait core::sys::FailWithCause for int
+// error-pattern:failed to find an implementation of trait std::sys::FailWithCause for int
 
 fn main() { fail!(5); }
diff --git a/src/test/compile-fail/fail-type-err.rs b/src/test/compile-fail/fail-type-err.rs
index fbfa85ea6f8..b6755249bcf 100644
--- a/src/test/compile-fail/fail-type-err.rs
+++ b/src/test/compile-fail/fail-type-err.rs
@@ -8,5 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:failed to find an implementation of trait core::sys::FailWithCause for ~[int]
+// error-pattern:failed to find an implementation of trait std::sys::FailWithCause for ~[int]
 fn main() { fail!(~[0i]); }
diff --git a/src/test/compile-fail/forget-init-unsafe.rs b/src/test/compile-fail/forget-init-unsafe.rs
index 2361b5ad6a9..25ab28b5fc0 100644
--- a/src/test/compile-fail/forget-init-unsafe.rs
+++ b/src/test/compile-fail/forget-init-unsafe.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::unstable::intrinsics::{init, forget};
+use std::unstable::intrinsics::{init, forget};
 
 // Test that the `forget` and `init` intrinsics are really unsafe
 pub fn main() {
diff --git a/src/test/compile-fail/fully-qualified-type-name1.rs b/src/test/compile-fail/fully-qualified-type-name1.rs
index c5e7fc82cc9..dd9833ad41f 100644
--- a/src/test/compile-fail/fully-qualified-type-name1.rs
+++ b/src/test/compile-fail/fully-qualified-type-name1.rs
@@ -13,5 +13,5 @@
 fn main() {
     let x: Option<uint>;
     x = 5;
-    //~^ ERROR mismatched types: expected `core::option::Option<uint>`
+    //~^ ERROR mismatched types: expected `std::option::Option<uint>`
 }
diff --git a/src/test/compile-fail/fully-qualified-type-name4.rs b/src/test/compile-fail/fully-qualified-type-name4.rs
index a91d8284e71..f49eb5ee85a 100644
--- a/src/test/compile-fail/fully-qualified-type-name4.rs
+++ b/src/test/compile-fail/fully-qualified-type-name4.rs
@@ -10,11 +10,11 @@
 
 // Test that we use fully-qualified type names in error messages.
 
-use core::task::Task;
+use std::task::Task;
 
 fn bar(x: uint) -> Task {
     return x;
-    //~^ ERROR mismatched types: expected `core::task::Task`
+    //~^ ERROR mismatched types: expected `std::task::Task`
 }
 
 fn main() {
diff --git a/src/test/compile-fail/issue-2766-a.rs b/src/test/compile-fail/issue-2766-a.rs
index 5b55cc772fd..41527027c74 100644
--- a/src/test/compile-fail/issue-2766-a.rs
+++ b/src/test/compile-fail/issue-2766-a.rs
@@ -11,8 +11,8 @@
 pub mod stream {
     pub enum Stream<T:Owned> { send(T, ::stream::server::Stream<T>), }
     pub mod server {
-        use core::option;
-        use core::pipes;
+        use std::option;
+        use std::pipes;
 
         pub impl<T:Owned> Stream<T> {
             pub fn recv() -> extern fn(v: Stream<T>) -> ::stream::Stream<T> {
diff --git a/src/test/compile-fail/issue-3021-b.rs b/src/test/compile-fail/issue-3021-b.rs
index 3769154c9d9..f9f1a27e11b 100644
--- a/src/test/compile-fail/issue-3021-b.rs
+++ b/src/test/compile-fail/issue-3021-b.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 fn siphash(k0 : u64) {
 
diff --git a/src/test/compile-fail/issue-3021-c.rs b/src/test/compile-fail/issue-3021-c.rs
index 4fc4c005cf6..a0b78a4bc79 100644
--- a/src/test/compile-fail/issue-3021-c.rs
+++ b/src/test/compile-fail/issue-3021-c.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 fn siphash<T>() {
 
diff --git a/src/test/compile-fail/issue-3021-d.rs b/src/test/compile-fail/issue-3021-d.rs
index 55c8e8aa51d..fd08d556bef 100644
--- a/src/test/compile-fail/issue-3021-d.rs
+++ b/src/test/compile-fail/issue-3021-d.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 trait siphash {
     fn result(&self) -> u64;
diff --git a/src/test/compile-fail/issue-3021.rs b/src/test/compile-fail/issue-3021.rs
index f2cf2d19a86..0ca6173275c 100644
--- a/src/test/compile-fail/issue-3021.rs
+++ b/src/test/compile-fail/issue-3021.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 trait SipHash {
     fn reset(&self);
diff --git a/src/test/compile-fail/issue-3296.rs b/src/test/compile-fail/issue-3296.rs
index 062ee8fd01e..ba0ad02f91c 100644
--- a/src/test/compile-fail/issue-3296.rs
+++ b/src/test/compile-fail/issue-3296.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std;
+use extra;
 
-struct Deserializer : std::serialization::deserializer{ //~ ERROR obsolete syntax: class traits
+struct Deserializer : extra::serialization::deserializer{ //~ ERROR obsolete syntax: class traits
     x: ()
 }
 
@@ -18,7 +18,7 @@ struct Foo {
     a: ()
 }
 
-fn deserialize_foo<__D: std::serialization::deserializer>(__d: __D) {
+fn deserialize_foo<__D: extra::serialization::deserializer>(__d: __D) {
 }
 
 fn main() { let des = Deserializer(); let foo = deserialize_foo(des); }
diff --git a/src/test/compile-fail/issue-3680.rs b/src/test/compile-fail/issue-3680.rs
index 18b5d290f3d..b453384c0c8 100644
--- a/src/test/compile-fail/issue-3680.rs
+++ b/src/test/compile-fail/issue-3680.rs
@@ -10,6 +10,6 @@
 
 fn main() {
     match None {
-        Err(_) => () //~ ERROR mismatched types: expected `core::option::Option<<V1>>` but found `core::result::Result<<V2>,<V3>>`
+        Err(_) => () //~ ERROR mismatched types: expected `std::option::Option<<V1>>` but found `std::result::Result<<V2>,<V3>>`
     }
 }
diff --git a/src/test/compile-fail/issue-3953.rs b/src/test/compile-fail/issue-3953.rs
index b726f090e7d..fc8e456f56b 100644
--- a/src/test/compile-fail/issue-3953.rs
+++ b/src/test/compile-fail/issue-3953.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;
 
 trait Hahaha: Eq + Eq + Eq + Eq + Eq + //~ ERROR Duplicate supertrait
               Eq + Eq + Eq + Eq + Eq + Eq + Eq + Eq + Eq + Eq + Eq + Eq + Eq +
diff --git a/src/test/compile-fail/issue-511.rs b/src/test/compile-fail/issue-511.rs
index c872f89d884..a053424b30d 100644
--- a/src/test/compile-fail/issue-511.rs
+++ b/src/test/compile-fail/issue-511.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use core::cmp::Eq;
+extern mod extra;
+use std::cmp::Eq;
 
 fn f<T:Eq>(o: &mut Option<T>) {
     assert!(*o == option::None);
diff --git a/src/test/compile-fail/issue-5358-1.rs b/src/test/compile-fail/issue-5358-1.rs
index 0b6e2fb0ff5..a3d25e7d2ad 100644
--- a/src/test/compile-fail/issue-5358-1.rs
+++ b/src/test/compile-fail/issue-5358-1.rs
@@ -12,7 +12,7 @@ struct S(Either<uint, uint>);
 
 fn main() {
     match S(Left(5)) {
-        Right(_) => {}  //~ ERROR mismatched types: expected `S` but found `core::either::Either
+        Right(_) => {}  //~ ERROR mismatched types: expected `S` but found `std::either::Either
         _ => {}
     }
 }
diff --git a/src/test/compile-fail/issue-5358.rs b/src/test/compile-fail/issue-5358.rs
index 7d11a127f9a..8d4f4633466 100644
--- a/src/test/compile-fail/issue-5358.rs
+++ b/src/test/compile-fail/issue-5358.rs
@@ -12,6 +12,6 @@ struct S(Either<uint, uint>);
 
 fn main() {
     match *S(Left(5)) {
-      S(_) => {}  //~ ERROR mismatched types: expected `core::either::Either<uint,uint>` but found a structure pattern
+      S(_) => {}  //~ ERROR mismatched types: expected `std::either::Either<uint,uint>` but found a structure pattern
     }
 }
diff --git a/src/test/compile-fail/lint-unused-imports.rs b/src/test/compile-fail/lint-unused-imports.rs
index dc5936777c9..201b2e9b989 100644
--- a/src/test/compile-fail/lint-unused-imports.rs
+++ b/src/test/compile-fail/lint-unused-imports.rs
@@ -12,23 +12,23 @@
 
 use cal = bar::c::cc;
 
-use core::either::Right;        //~ ERROR unused import
+use std::either::Right;        //~ ERROR unused import
 
-use core::util::*;              // shouldn't get errors for not using
+use std::util::*;              // shouldn't get errors for not using
                                 // everything imported
 
 // Should get errors for both 'Some' and 'None'
-use core::option::{Some, None}; //~ ERROR unused import
+use std::option::{Some, None}; //~ ERROR unused import
                                 //~^ ERROR unused import
 
-use core::io::ReaderUtil;       //~ ERROR unused import
+use std::io::ReaderUtil;       //~ ERROR unused import
 // Be sure that if we just bring some methods into scope that they're also
 // counted as being used.
-use core::io::WriterUtil;
+use std::io::WriterUtil;
 
 // Make sure this import is warned about when at least one of its imported names
 // is unused
-use core::vec::{filter, map};   //~ ERROR unused import
+use std::vec::{filter, map};   //~ ERROR unused import
 
 mod foo {
     pub struct Point{x: int, y: int}
@@ -37,7 +37,7 @@ mod foo {
 
 mod bar {
     // Don't ignore on 'pub use' because we're not sure if it's used or not
-    pub use core::cmp::Eq;
+    pub use std::cmp::Eq;
 
     pub mod c {
         use foo::Point;
@@ -47,7 +47,7 @@ mod bar {
 
     #[allow(unused_imports)]
     mod foo {
-        use core::cmp::Eq;
+        use std::cmp::Eq;
     }
 }
 
diff --git a/src/test/compile-fail/map-types.rs b/src/test/compile-fail/map-types.rs
index ebc5b015d27..f5d6e95fe2f 100644
--- a/src/test/compile-fail/map-types.rs
+++ b/src/test/compile-fail/map-types.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::container::Map;
-use core::hashmap::HashMap;
+use std::container::Map;
+use std::hashmap::HashMap;
 
 // Test that trait types printed in error msgs include the type arguments.
 
@@ -17,5 +17,5 @@ fn main() {
     let x: @Map<~str, ~str> = @HashMap::new::<~str, ~str>() as
         @Map<~str, ~str>;
     let y: @Map<uint, ~str> = @x;
-    //~^ ERROR mismatched types: expected `@core::container::Map<uint,~str>`
+    //~^ ERROR mismatched types: expected `@std::container::Map<uint,~str>`
 }
diff --git a/src/test/compile-fail/moves-based-on-type-cyclic-types-issue-4821.rs b/src/test/compile-fail/moves-based-on-type-cyclic-types-issue-4821.rs
index 2b9291ce328..7c01ddb6c93 100644
--- a/src/test/compile-fail/moves-based-on-type-cyclic-types-issue-4821.rs
+++ b/src/test/compile-fail/moves-based-on-type-cyclic-types-issue-4821.rs
@@ -12,7 +12,7 @@
 // temporary kinds wound up being stored in a cache and used later.
 // See middle::ty::type_contents() for more information.
 
-extern mod std;
+extern mod extra;
 
 struct List { key: int, next: Option<~List> }
 
diff --git a/src/test/compile-fail/mutable-huh-ptr-assign.rs b/src/test/compile-fail/mutable-huh-ptr-assign.rs
index c907eb4be49..4460da72e20 100644
--- a/src/test/compile-fail/mutable-huh-ptr-assign.rs
+++ b/src/test/compile-fail/mutable-huh-ptr-assign.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 fn main() {
     unsafe fn f(v: *const int) {
diff --git a/src/test/compile-fail/name-clash-nullary.rs b/src/test/compile-fail/name-clash-nullary.rs
index e64d651dab2..68f5d921d02 100644
--- a/src/test/compile-fail/name-clash-nullary.rs
+++ b/src/test/compile-fail/name-clash-nullary.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // error-pattern:declaration of `None` shadows
-use core::option::*;
+use std::option::*;
 
 fn main() {
   let None: int = 42;
diff --git a/src/test/compile-fail/no-capture-arc.rs b/src/test/compile-fail/no-capture-arc.rs
index 4c206a949a2..132a5326a88 100644
--- a/src/test/compile-fail/no-capture-arc.rs
+++ b/src/test/compile-fail/no-capture-arc.rs
@@ -10,8 +10,8 @@
 
 // error-pattern: use of moved value
 
-extern mod std;
-use std::arc;
+extern mod extra;
+use extra::arc;
 
 fn main() {
     let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
diff --git a/src/test/compile-fail/no-reuse-move-arc.rs b/src/test/compile-fail/no-reuse-move-arc.rs
index 46eaded4527..8bed4e6da47 100644
--- a/src/test/compile-fail/no-reuse-move-arc.rs
+++ b/src/test/compile-fail/no-reuse-move-arc.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::arc;
+extern mod extra;
+use extra::arc;
 
 fn main() {
     let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
diff --git a/src/test/compile-fail/no-send-res-ports.rs b/src/test/compile-fail/no-send-res-ports.rs
index c1071e5a8c4..951103bfbe3 100644
--- a/src/test/compile-fail/no-send-res-ports.rs
+++ b/src/test/compile-fail/no-send-res-ports.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cell::Cell;
+use std::cell::Cell;
 
 struct Port<T>(@T);
 
diff --git a/src/test/compile-fail/noexporttypeexe.rs b/src/test/compile-fail/noexporttypeexe.rs
index 95428568e4c..3add0134d00 100644
--- a/src/test/compile-fail/noexporttypeexe.rs
+++ b/src/test/compile-fail/noexporttypeexe.rs
@@ -18,5 +18,5 @@ fn main() {
     // because the def_id associated with the type was
     // not convertible to a path.
   let x: int = noexporttypelib::foo();
-    //~^ ERROR expected `int` but found `core::option::Option<int>`
+    //~^ ERROR expected `int` but found `std::option::Option<int>`
 }
diff --git a/src/test/compile-fail/pattern-tyvar-2.rs b/src/test/compile-fail/pattern-tyvar-2.rs
index 41529b3da93..537d095d2d7 100644
--- a/src/test/compile-fail/pattern-tyvar-2.rs
+++ b/src/test/compile-fail/pattern-tyvar-2.rs
@@ -10,7 +10,7 @@
 // except according to those terms.
 
 
-extern mod std;
+extern mod extra;
 
 enum bar { t1((), Option<~[int]>), t2, }
 
diff --git a/src/test/compile-fail/pattern-tyvar.rs b/src/test/compile-fail/pattern-tyvar.rs
index 506c71f493a..4ca0aac35ee 100644
--- a/src/test/compile-fail/pattern-tyvar.rs
+++ b/src/test/compile-fail/pattern-tyvar.rs
@@ -9,7 +9,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 // error-pattern: mismatched types
 
diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/compile-fail/qquote-1.rs
index 1241190b537..156d09cedff 100644
--- a/src/test/compile-fail/qquote-1.rs
+++ b/src/test/compile-fail/qquote-1.rs
@@ -10,7 +10,7 @@
 
 // xfail-test Can't use syntax crate here
 
-extern mod std;
+extern mod extra;
 extern mod syntax;
 
 use io::*;
diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/compile-fail/qquote-2.rs
index 07500825a95..2a593c51759 100644
--- a/src/test/compile-fail/qquote-2.rs
+++ b/src/test/compile-fail/qquote-2.rs
@@ -10,10 +10,10 @@
 
 // xfail-test Can't use syntax crate here
 
-extern mod std;
+extern mod extra;
 extern mod syntax;
 
-use std::io::*;
+use extra::io::*;
 
 use syntax::diagnostic;
 use syntax::ast;
diff --git a/src/test/compile-fail/regions-glb-free-free.rs b/src/test/compile-fail/regions-glb-free-free.rs
index 61300b92afd..dc3d414e91b 100644
--- a/src/test/compile-fail/regions-glb-free-free.rs
+++ b/src/test/compile-fail/regions-glb-free-free.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 mod argparse {
-    extern mod std;
+    extern mod extra;
 
     pub struct Flag<'self> {
         name: &'self str,
diff --git a/src/test/compile-fail/seq-args.rs b/src/test/compile-fail/seq-args.rs
index 0d253d78283..a6ab41a3d6b 100644
--- a/src/test/compile-fail/seq-args.rs
+++ b/src/test/compile-fail/seq-args.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 fn main() {
 trait seq { }
 
diff --git a/src/test/compile-fail/spawn-non-nil-fn.rs b/src/test/compile-fail/spawn-non-nil-fn.rs
index 00e3e612e8f..9dbef369257 100644
--- a/src/test/compile-fail/spawn-non-nil-fn.rs
+++ b/src/test/compile-fail/spawn-non-nil-fn.rs
@@ -10,6 +10,6 @@
 
 // error-pattern: mismatched types
 
-extern mod std;
+extern mod extra;
 
 fn main() { task::spawn(|| -> int { 10 }); }
diff --git a/src/test/compile-fail/sync-cond-shouldnt-escape.rs b/src/test/compile-fail/sync-cond-shouldnt-escape.rs
index 964c2ce946b..b22d4d3b2e2 100644
--- a/src/test/compile-fail/sync-cond-shouldnt-escape.rs
+++ b/src/test/compile-fail/sync-cond-shouldnt-escape.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // error-pattern: reference is not valid outside of its lifetime
-extern mod std;
-use std::sync;
+extern mod extra;
+use extra::sync;
 
 fn main() {
     let m = ~sync::Mutex();
diff --git a/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs
index 9cab2d3b056..518e67800d7 100644
--- a/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs
+++ b/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // error-pattern: reference is not valid outside of its lifetime
-extern mod std;
-use std::sync;
+extern mod extra;
+use extra::sync;
 fn main() {
     let x = ~sync::RWlock();
     let mut y = None;
diff --git a/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs
index 4195d870067..4bec5fa270a 100644
--- a/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs
+++ b/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // error-pattern: cannot infer an appropriate lifetime
-extern mod std;
-use std::sync;
+extern mod extra;
+use extra::sync;
 fn main() {
     let x = ~sync::RWlock();
     let mut y = None;
diff --git a/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs
index 43ad693ccf8..09b83887bcf 100644
--- a/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs
+++ b/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // error-pattern: reference is not valid outside of its lifetime
-extern mod std;
-use std::sync;
+extern mod extra;
+use extra::sync;
 fn main() {
     let x = ~sync::RWlock();
     let mut y = None;
diff --git a/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs
index 525d334f411..679c4a72598 100644
--- a/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs
+++ b/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // error-pattern: reference is not valid outside of its lifetime
-extern mod std;
-use std::sync;
+extern mod extra;
+use extra::sync;
 fn main() {
     let x = ~sync::RWlock();
     let mut y = None;
diff --git a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs
index f167ee3d5c4..ebd3320d901 100644
--- a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs
+++ b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs
@@ -13,9 +13,9 @@
 
 #[no_std];
 
-extern mod core;
+extern mod std;
 
-fn last<T>(v: ~[&T]) -> core::option::Option<T> {
+fn last<T>(v: ~[&T]) -> std::option::Option<T> {
     fail!();
 }
 
diff --git a/src/test/compile-fail/use-meta-dup.rs b/src/test/compile-fail/use-meta-dup.rs
index 805a853c315..dd57382afbb 100644
--- a/src/test/compile-fail/use-meta-dup.rs
+++ b/src/test/compile-fail/use-meta-dup.rs
@@ -10,6 +10,6 @@
 
 // error-pattern:duplicate meta item `name`
 
-extern mod std(name = "std", name = "nonstd");
+extern mod extra(name = "extra", name = "nonstd");
 
 fn main() { }
diff --git a/src/test/compile-fail/use-meta-mismatch.rs b/src/test/compile-fail/use-meta-mismatch.rs
index b643e9421f5..118fce8a891 100644
--- a/src/test/compile-fail/use-meta-mismatch.rs
+++ b/src/test/compile-fail/use-meta-mismatch.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:can't find crate for `std`
+// error-pattern:can't find crate for `extra`
 
-extern mod std(complex(meta(item)));
+extern mod extra(complex(meta(item)));
 
 fn main() { }
diff --git a/src/test/compile-fail/view-items-at-top.rs b/src/test/compile-fail/view-items-at-top.rs
index 023be703cca..fa03e0d5199 100644
--- a/src/test/compile-fail/view-items-at-top.rs
+++ b/src/test/compile-fail/view-items-at-top.rs
@@ -10,12 +10,12 @@
 
 // xfail-test
 
-extern mod std;
+extern mod extra;
 
 fn f() {
 }
 
-use std::net;    //~ ERROR view items must be declared at the top
+use extra::net;    //~ ERROR view items must be declared at the top
 
 fn main() {
 }
diff --git a/src/test/run-fail/extern-fail.rs b/src/test/run-fail/extern-fail.rs
index d7ec9f08865..15cc8a48867 100644
--- a/src/test/run-fail/extern-fail.rs
+++ b/src/test/run-fail/extern-fail.rs
@@ -12,7 +12,7 @@
 // Testing that runtime failure doesn't cause callbacks to abort abnormally.
 // Instead the failure will be delivered after the callbacks return.
 
-use core::old_iter;
+use std::old_iter;
 
 mod rustrt {
     pub extern {
diff --git a/src/test/run-fail/fail-main.rs b/src/test/run-fail/fail-main.rs
index beb0d38ea47..f007e03041c 100644
--- a/src/test/run-fail/fail-main.rs
+++ b/src/test/run-fail/fail-main.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 // error-pattern:moop
-extern mod std;
+extern mod extra;
 fn main() { fail!("moop"); }
diff --git a/src/test/run-fail/fmt-fail.rs b/src/test/run-fail/fmt-fail.rs
index 10d89038381..d34ca029023 100644
--- a/src/test/run-fail/fmt-fail.rs
+++ b/src/test/run-fail/fmt-fail.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 // error-pattern:meh
-extern mod std;
+extern mod extra;
 
 fn main() { let str_var: ~str = ~"meh"; fail!(fmt!("%s", str_var)); }
diff --git a/src/test/run-fail/for-each-loop-fail.rs b/src/test/run-fail/for-each-loop-fail.rs
index 3ae387952a2..06422244af9 100644
--- a/src/test/run-fail/for-each-loop-fail.rs
+++ b/src/test/run-fail/for-each-loop-fail.rs
@@ -9,5 +9,5 @@
 // except according to those terms.
 
 // error-pattern:moop
-extern mod std;
+extern mod extra;
 fn main() { for uint::range(0u, 10u) |_i| { fail!("moop"); } }
diff --git a/src/test/run-fail/issue-2156.rs b/src/test/run-fail/issue-2156.rs
index 9ca343e3866..de0b903b53c 100644
--- a/src/test/run-fail/issue-2156.rs
+++ b/src/test/run-fail/issue-2156.rs
@@ -10,8 +10,8 @@
 
 // error-pattern:explicit failure
 // Don't double free the string
-extern mod std;
-use core::io::ReaderUtil;
+extern mod extra;
+use std::io::ReaderUtil;
 
 fn main() {
     do io::with_str_reader(~"") |rdr| {
diff --git a/src/test/run-fail/issue-2444.rs b/src/test/run-fail/issue-2444.rs
index 04a0f47fc06..0ab1528e4fb 100644
--- a/src/test/run-fail/issue-2444.rs
+++ b/src/test/run-fail/issue-2444.rs
@@ -10,8 +10,8 @@
 
 // error-pattern:explicit failure
 
-extern mod std;
-use std::arc;
+extern mod extra;
+use extra::arc;
 
 enum e<T> { e(arc::ARC<T>) }
 
diff --git a/src/test/run-fail/linked-failure.rs b/src/test/run-fail/linked-failure.rs
index 054d6f697ae..6a87e202d13 100644
--- a/src/test/run-fail/linked-failure.rs
+++ b/src/test/run-fail/linked-failure.rs
@@ -11,7 +11,7 @@
 
 
 // error-pattern:1 == 2
-extern mod std;
+extern mod extra;
 
 fn child() { assert!((1 == 2)); }
 
diff --git a/src/test/run-fail/morestack2.rs b/src/test/run-fail/morestack2.rs
index d59fbae2f9f..f829767edf1 100644
--- a/src/test/run-fail/morestack2.rs
+++ b/src/test/run-fail/morestack2.rs
@@ -15,7 +15,7 @@
 // See the hack in upcall_call_shim_on_c_stack where it messes
 // with the stack limit.
 
-extern mod std;
+extern mod extra;
 
 mod rustrt {
     pub extern {
diff --git a/src/test/run-fail/morestack3.rs b/src/test/run-fail/morestack3.rs
index 012e9d19b12..6ab064f3827 100644
--- a/src/test/run-fail/morestack3.rs
+++ b/src/test/run-fail/morestack3.rs
@@ -12,7 +12,7 @@
 
 // Just testing unwinding
 
-extern mod std;
+extern mod extra;
 
 fn getbig_and_fail(i: int) {
     let _r = and_then_get_big_again(5);
diff --git a/src/test/run-fail/morestack4.rs b/src/test/run-fail/morestack4.rs
index 6fc187491cf..e07c7997108 100644
--- a/src/test/run-fail/morestack4.rs
+++ b/src/test/run-fail/morestack4.rs
@@ -12,7 +12,7 @@
 
 // Just testing unwinding
 
-extern mod std;
+extern mod extra;
 
 fn getbig_and_fail(i: int) {
     let r = and_then_get_big_again(5);
diff --git a/src/test/run-fail/run-unexported-tests.rs b/src/test/run-fail/run-unexported-tests.rs
index b055bf4ed95..e9d3c41faa6 100644
--- a/src/test/run-fail/run-unexported-tests.rs
+++ b/src/test/run-fail/run-unexported-tests.rs
@@ -11,7 +11,7 @@
 // error-pattern:runned an unexported test
 // compile-flags:--test
 
-extern mod std;
+extern mod extra;
 
 mod m {
     pub fn exported() { }
diff --git a/src/test/run-fail/spawnfail.rs b/src/test/run-fail/spawnfail.rs
index 8431f7bb74d..fc4977308ae 100644
--- a/src/test/run-fail/spawnfail.rs
+++ b/src/test/run-fail/spawnfail.rs
@@ -10,7 +10,7 @@
 
 // xfail-win32
 // error-pattern:explicit
-extern mod std;
+extern mod extra;
 
 // We don't want to see any invalid reads
 fn main() {
diff --git a/src/test/run-fail/unwind-misc-1.rs b/src/test/run-fail/unwind-misc-1.rs
index 7e3318f8652..e30054575d6 100644
--- a/src/test/run-fail/unwind-misc-1.rs
+++ b/src/test/run-fail/unwind-misc-1.rs
@@ -14,7 +14,7 @@
 
 fn main() {
     let count = @mut 0u;
-    let mut map = core::hashmap::HashMap::new();
+    let mut map = std::hashmap::HashMap::new();
     let mut arr = ~[];
     for uint::range(0u, 10u) |i| {
         arr += ~[@~"key stuff"];
diff --git a/src/test/run-fail/zip-different-lengths.rs b/src/test/run-fail/zip-different-lengths.rs
index ae76c4ba603..355a2ce93ed 100644
--- a/src/test/run-fail/zip-different-lengths.rs
+++ b/src/test/run-fail/zip-different-lengths.rs
@@ -11,8 +11,8 @@
 // In this case, the code should compile but
 // the assert should fail at runtime
 // error-pattern:assertion failed
-extern mod std;
-use core::vec::{same_length, zip};
+extern mod extra;
+use std::vec::{same_length, zip};
 
 fn enum_chars(start: u8, end: u8) -> ~[char] {
     assert!(start < end);
diff --git a/src/test/run-pass-fulldeps/qquote.rs b/src/test/run-pass-fulldeps/qquote.rs
index 53385e16759..9a3ba32390c 100644
--- a/src/test/run-pass-fulldeps/qquote.rs
+++ b/src/test/run-pass-fulldeps/qquote.rs
@@ -10,10 +10,10 @@
 
 // xfail-pretty
 
-extern mod std;
+extern mod extra;
 extern mod syntax;
 
-use core::io::*;
+use std::io::*;
 
 use syntax::diagnostic;
 use syntax::ast;
diff --git a/src/test/run-pass/alt-join.rs b/src/test/run-pass/alt-join.rs
index b9f25396b32..66b64768060 100644
--- a/src/test/run-pass/alt-join.rs
+++ b/src/test/run-pass/alt-join.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 
-extern mod std;
+extern mod extra;
 
 fn foo<T>(y: Option<T>) {
     let mut x: int;
diff --git a/src/test/run-pass/alt-pattern-drop.rs b/src/test/run-pass/alt-pattern-drop.rs
index d9f3f10a11b..71bbb1768e8 100644
--- a/src/test/run-pass/alt-pattern-drop.rs
+++ b/src/test/run-pass/alt-pattern-drop.rs
@@ -14,7 +14,7 @@
 enum t { make_t(@int), clam, }
 
 fn foo(s: @int) {
-    let count = ::core::sys::refcount(s);
+    let count = ::std::sys::refcount(s);
     let x: t = make_t(s); // ref up
 
     match x {
@@ -24,20 +24,20 @@ fn foo(s: @int) {
       }
       _ => { debug!("?"); fail!(); }
     }
-    debug!(::core::sys::refcount(s));
-    assert_eq!(::core::sys::refcount(s), count + 1u);
-    let _ = ::core::sys::refcount(s); // don't get bitten by last-use.
+    debug!(::std::sys::refcount(s));
+    assert_eq!(::std::sys::refcount(s), count + 1u);
+    let _ = ::std::sys::refcount(s); // don't get bitten by last-use.
 }
 
 pub fn main() {
     let s: @int = @0; // ref up
 
-    let count = ::core::sys::refcount(s);
+    let count = ::std::sys::refcount(s);
 
     foo(s); // ref up then down
 
-    debug!("%u", ::core::sys::refcount(s));
-    let count2 = ::core::sys::refcount(s);
-    let _ = ::core::sys::refcount(s); // don't get bitten by last-use.
+    debug!("%u", ::std::sys::refcount(s));
+    let count2 = ::std::sys::refcount(s);
+    let _ = ::std::sys::refcount(s); // don't get bitten by last-use.
     assert_eq!(count, count2);
 }
diff --git a/src/test/run-pass/attr-before-view-item.rs b/src/test/run-pass/attr-before-view-item.rs
index aa5c3bb22a3..316f8fa0f61 100644
--- a/src/test/run-pass/attr-before-view-item.rs
+++ b/src/test/run-pass/attr-before-view-item.rs
@@ -11,7 +11,7 @@
 // error-pattern:expected item
 
 #[foo = "bar"]
-extern mod std;
+extern mod extra;
 
 pub fn main() {
 }
diff --git a/src/test/run-pass/attr-before-view-item2.rs b/src/test/run-pass/attr-before-view-item2.rs
index e0d9a05b8aa..0721544aa0d 100644
--- a/src/test/run-pass/attr-before-view-item2.rs
+++ b/src/test/run-pass/attr-before-view-item2.rs
@@ -12,7 +12,7 @@
 
 mod m {
     #[foo = "bar"]
-    extern mod std;
+    extern mod extra;
 }
 
 pub fn main() {
diff --git a/src/test/run-pass/auto-encode.rs b/src/test/run-pass/auto-encode.rs
index cfac8e8cd06..0c2f24b5bf7 100644
--- a/src/test/run-pass/auto-encode.rs
+++ b/src/test/run-pass/auto-encode.rs
@@ -12,18 +12,18 @@
 
 #[forbid(deprecated_pattern)];
 
-extern mod std;
+extern mod extra;
 
 // These tests used to be separate files, but I wanted to refactor all
 // the common code.
 
-use EBReader = std::ebml::reader;
-use EBWriter = std::ebml::writer;
-use core::cmp::Eq;
-use core::io::Writer;
-use std::ebml;
-use std::serialize::{Decodable, Encodable};
-use std::time;
+use EBReader = extra::ebml::reader;
+use EBWriter = extra::ebml::writer;
+use std::cmp::Eq;
+use std::io::Writer;
+use extra::ebml;
+use extra::serialize::{Decodable, Encodable};
+use extra::time;
 
 fn test_ebml<A:
     Eq +
diff --git a/src/test/run-pass/bind-by-move.rs b/src/test/run-pass/bind-by-move.rs
index 8752102c3a5..5cde389ff75 100644
--- a/src/test/run-pass/bind-by-move.rs
+++ b/src/test/run-pass/bind-by-move.rs
@@ -9,8 +9,8 @@
 // except according to those terms.
 
 // xfail-fast
-extern mod std;
-use std::arc;
+extern mod extra;
+use extra::arc;
 fn dispose(_x: arc::ARC<bool>) { unsafe { } }
 
 pub fn main() {
diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs
index 9039730f119..a7e910538c9 100644
--- a/src/test/run-pass/binops.rs
+++ b/src/test/run-pass/binops.rs
@@ -64,9 +64,9 @@ fn test_box() {
 
 fn test_ptr() {
     unsafe {
-        let p1: *u8 = ::core::cast::transmute(0);
-        let p2: *u8 = ::core::cast::transmute(0);
-        let p3: *u8 = ::core::cast::transmute(1);
+        let p1: *u8 = ::std::cast::transmute(0);
+        let p2: *u8 = ::std::cast::transmute(0);
+        let p3: *u8 = ::std::cast::transmute(1);
 
         assert_eq!(p1, p2);
         assert!(p1 != p3);
@@ -107,8 +107,8 @@ fn test_class() {
 
   unsafe {
   error!("q = %x, r = %x",
-         (::core::cast::transmute::<*p, uint>(&q)),
-         (::core::cast::transmute::<*p, uint>(&r)));
+         (::std::cast::transmute::<*p, uint>(&q)),
+         (::std::cast::transmute::<*p, uint>(&r)));
   }
   assert_eq!(q, r);
   r.y = 17;
diff --git a/src/test/run-pass/bitv-perf-test.rs b/src/test/run-pass/bitv-perf-test.rs
index 2d47916d050..c6edbfbe463 100644
--- a/src/test/run-pass/bitv-perf-test.rs
+++ b/src/test/run-pass/bitv-perf-test.rs
@@ -10,8 +10,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::bitv::*;
+extern mod extra;
+use extra::bitv::*;
 
 fn bitv_test() -> bool {
     let mut v1 = ~Bitv::new(31, false);
diff --git a/src/test/run-pass/block-arg-call-as.rs b/src/test/run-pass/block-arg-call-as.rs
index e2745832769..d68b0be632e 100644
--- a/src/test/run-pass/block-arg-call-as.rs
+++ b/src/test/run-pass/block-arg-call-as.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 fn asSendfn( f : ~fn()->uint ) -> uint {
    return f();
diff --git a/src/test/run-pass/block-vec-map_zip.rs b/src/test/run-pass/block-vec-map_zip.rs
index b859dc91fba..4c37000113c 100644
--- a/src/test/run-pass/block-vec-map_zip.rs
+++ b/src/test/run-pass/block-vec-map_zip.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 pub fn main() {
     let v =
diff --git a/src/test/run-pass/borrowck-mut-uniq.rs b/src/test/run-pass/borrowck-mut-uniq.rs
index 023eaae0a76..fa5ae984507 100644
--- a/src/test/run-pass/borrowck-mut-uniq.rs
+++ b/src/test/run-pass/borrowck-mut-uniq.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::util;
+use std::util;
 
 struct Ints {sum: ~int, values: ~[int]}
 
diff --git a/src/test/run-pass/c-stack-returning-int64.rs b/src/test/run-pass/c-stack-returning-int64.rs
index ec204e7a4c2..647c42cf891 100644
--- a/src/test/run-pass/c-stack-returning-int64.rs
+++ b/src/test/run-pass/c-stack-returning-int64.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 mod libc {
     #[abi = "cdecl"]
diff --git a/src/test/run-pass/capture_nil.rs b/src/test/run-pass/capture_nil.rs
index 817891c1146..c9a1c031e84 100644
--- a/src/test/run-pass/capture_nil.rs
+++ b/src/test/run-pass/capture_nil.rs
@@ -24,7 +24,7 @@
 // course preferable, as the value itself is
 // irrelevant).
 
-use core::comm::*;
+use std::comm::*;
 
 fn foo(x: ()) -> Port<()> {
     let (p, c) = stream::<()>();
diff --git a/src/test/run-pass/child-outlives-parent.rs b/src/test/run-pass/child-outlives-parent.rs
index 4eb3cea3a25..de933b53a18 100644
--- a/src/test/run-pass/child-outlives-parent.rs
+++ b/src/test/run-pass/child-outlives-parent.rs
@@ -10,7 +10,7 @@
 
 // Reported as issue #126, child leaks the string.
 
-extern mod std;
+extern mod extra;
 
 fn child2(s: ~str) { }
 
diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs
index 8bedfef89d0..393c9e2ece0 100644
--- a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs
+++ b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs
@@ -11,7 +11,7 @@
 // xfail-fast
 // aux-build:cci_class_cast.rs
 extern mod cci_class_cast;
-use core::to_str::ToStr;
+use std::to_str::ToStr;
 use cci_class_cast::kitty::*;
 
 fn print_out(thing: @ToStr, expected: ~str) {
diff --git a/src/test/run-pass/class-impl-parameterized-trait.rs b/src/test/run-pass/class-impl-parameterized-trait.rs
index 04784b5c515..09967f0ab36 100644
--- a/src/test/run-pass/class-impl-parameterized-trait.rs
+++ b/src/test/run-pass/class-impl-parameterized-trait.rs
@@ -11,8 +11,8 @@
 // xfail-test
 // xfail-fast
 
-extern mod std;
-use std::oldmap::*;
+extern mod extra;
+use extra::oldmap::*;
 
 class cat : map<int, bool> {
   priv {
diff --git a/src/test/run-pass/class-impl-very-parameterized-trait.rs b/src/test/run-pass/class-impl-very-parameterized-trait.rs
index ae3d088c539..a73af840fe4 100644
--- a/src/test/run-pass/class-impl-very-parameterized-trait.rs
+++ b/src/test/run-pass/class-impl-very-parameterized-trait.rs
@@ -10,8 +10,8 @@
 
 // xfail-fast
 
-use core::container::{Container, Mutable, Map};
-use core::old_iter::BaseIter;
+use std::container::{Container, Mutable, Map};
+use std::old_iter::BaseIter;
 
 enum cat_type { tuxedo, tabby, tortoiseshell }
 
diff --git a/src/test/run-pass/class-implements-multiple-traits.rs b/src/test/run-pass/class-implements-multiple-traits.rs
index 9545f5340df..7a3045db91f 100644
--- a/src/test/run-pass/class-implements-multiple-traits.rs
+++ b/src/test/run-pass/class-implements-multiple-traits.rs
@@ -10,8 +10,8 @@
 
 // xfail-test
 
-extern mod std;
-use std::oldmap::*;
+extern mod extra;
+use extra::oldmap::*;
 use vec::*;
 use dvec::{dvec, extensions};
 
diff --git a/src/test/run-pass/class-trait-bounded-param.rs b/src/test/run-pass/class-trait-bounded-param.rs
index 0246946102b..75c62abcb0d 100644
--- a/src/test/run-pass/class-trait-bounded-param.rs
+++ b/src/test/run-pass/class-trait-bounded-param.rs
@@ -10,8 +10,8 @@
 
 // xfail-test
 
-extern mod std;
-use std::oldmap::{map, hashmap, int_hash};
+extern mod extra;
+use extra::oldmap::{map, hashmap, int_hash};
 
 class keys<K:Copy,V:Copy,M:Copy + map<K,V>>
     : old_iter::base_iter<K> {
diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/run-pass/clone-with-exterior.rs
index 091f955aca0..f6a7856dccc 100644
--- a/src/test/run-pass/clone-with-exterior.rs
+++ b/src/test/run-pass/clone-with-exterior.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use core::task::spawn;
+extern mod extra;
+use std::task::spawn;
 
 struct Pair {
     a: int,
diff --git a/src/test/run-pass/coherence-impl-in-fn.rs b/src/test/run-pass/coherence-impl-in-fn.rs
index 7643799df06..707a7bf4076 100644
--- a/src/test/run-pass/coherence-impl-in-fn.rs
+++ b/src/test/run-pass/coherence-impl-in-fn.rs
@@ -10,7 +10,7 @@
 
 pub fn main() {
     enum x { foo }
-    impl ::core::cmp::Eq for x {
+    impl ::std::cmp::Eq for x {
         fn eq(&self, other: &x) -> bool {
             (*self) as int == (*other) as int
         }
diff --git a/src/test/run-pass/comm.rs b/src/test/run-pass/comm.rs
index 510976c5646..c307cf809b6 100644
--- a/src/test/run-pass/comm.rs
+++ b/src/test/run-pass/comm.rs
@@ -9,7 +9,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::comm::*;
+use std::comm::*;
 
 pub fn main() {
     let (p, ch) = stream();
diff --git a/src/test/run-pass/core-export-f64-sqrt.rs b/src/test/run-pass/core-export-f64-sqrt.rs
index d7ac91fe75c..7e00d7efbe2 100644
--- a/src/test/run-pass/core-export-f64-sqrt.rs
+++ b/src/test/run-pass/core-export-f64-sqrt.rs
@@ -14,5 +14,5 @@ pub fn main() {
 
     let digits: uint = 10 as uint;
 
-    ::core::io::println(float::to_str_digits(f64::sqrt(42.0f64) as float, digits));
+    ::std::io::println(float::to_str_digits(f64::sqrt(42.0f64) as float, digits));
 }
diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/run-pass/core-run-destroy.rs
index a4f3f59f46b..b2f444d39e2 100644
--- a/src/test/run-pass/core-run-destroy.rs
+++ b/src/test/run-pass/core-run-destroy.rs
@@ -13,10 +13,10 @@
 
 // NB: These tests kill child processes. Valgrind sees these children as leaking
 // memory, which makes for some *confusing* logs. That's why these are here
-// instead of in core.
+// instead of in std.
 
-use core::run;
-use core::run::*;
+use std::run;
+use std::run::*;
 
 #[test]
 fn test_destroy_once() {
@@ -47,9 +47,9 @@ fn test_destroy_actually_kills(force: bool) {
     #[cfg(windows)]
     fn process_exists(pid: libc::pid_t) -> bool {
 
-        use core::libc::types::os::arch::extra::DWORD;
-        use core::libc::funcs::extra::kernel32::{CloseHandle, GetExitCodeProcess, OpenProcess};
-        use core::libc::consts::os::extra::{FALSE, PROCESS_QUERY_INFORMATION, STILL_ACTIVE };
+        use std::libc::types::os::arch::extra::DWORD;
+        use std::libc::funcs::extra::kernel32::{CloseHandle, GetExitCodeProcess, OpenProcess};
+        use std::libc::consts::os::extra::{FALSE, PROCESS_QUERY_INFORMATION, STILL_ACTIVE };
 
         unsafe {
             let proc = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid as DWORD);
diff --git a/src/test/run-pass/deriving-meta-multiple.rs b/src/test/run-pass/deriving-meta-multiple.rs
index d94b6fcb415..f0b2d2ec827 100644
--- a/src/test/run-pass/deriving-meta-multiple.rs
+++ b/src/test/run-pass/deriving-meta-multiple.rs
@@ -19,7 +19,7 @@ struct Foo {
 }
 
 pub fn main() {
-    use core::hash::{Hash, HashUtil}; // necessary for IterBytes check
+    use std::hash::{Hash, HashUtil}; // necessary for IterBytes check
 
     let a = Foo {bar: 4, baz: -3};
 
diff --git a/src/test/run-pass/deriving-meta.rs b/src/test/run-pass/deriving-meta.rs
index efb202028f3..aef671ba757 100644
--- a/src/test/run-pass/deriving-meta.rs
+++ b/src/test/run-pass/deriving-meta.rs
@@ -17,7 +17,7 @@ struct Foo {
 }
 
 pub fn main() {
-    use core::hash::{Hash, HashUtil}; // necessary for IterBytes check
+    use std::hash::{Hash, HashUtil}; // necessary for IterBytes check
 
     let a = Foo {bar: 4, baz: -3};
 
diff --git a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs b/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs
index b0b03d8419b..2d42088fc14 100644
--- a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs
+++ b/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs
@@ -10,7 +10,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cmp::{Less,Equal,Greater};
+use std::cmp::{Less,Equal,Greater};
 
 #[deriving(TotalEq,TotalOrd)]
 struct A<'self> {
diff --git a/src/test/run-pass/drop-trait-generic.rs b/src/test/run-pass/drop-trait-generic.rs
index 65c3faac2b3..6c565604fce 100644
--- a/src/test/run-pass/drop-trait-generic.rs
+++ b/src/test/run-pass/drop-trait-generic.rs
@@ -13,7 +13,7 @@ struct S<T> {
 }
 
 #[unsafe_destructor]
-impl<T> ::core::ops::Drop for S<T> {
+impl<T> ::std::ops::Drop for S<T> {
     fn finalize(&self) {
         io::println("bye");
     }
diff --git a/src/test/run-pass/duplicate-use.rs b/src/test/run-pass/duplicate-use.rs
index f81b33105e6..35d5d2ffe8a 100644
--- a/src/test/run-pass/duplicate-use.rs
+++ b/src/test/run-pass/duplicate-use.rs
@@ -9,10 +9,10 @@
 // except according to those terms.
 
 // xfail-test
-extern mod std;
+extern mod extra;
 
-use list = std::oldmap::chained;
-use std::list;
+use list = extra::oldmap::chained;
+use extra::list;
 
 pub fn main() {
     let _x: list::T<int, int> = list::mk();
diff --git a/src/test/run-pass/explicit-self-generic.rs b/src/test/run-pass/explicit-self-generic.rs
index ad8af0ce639..c500201d65d 100644
--- a/src/test/run-pass/explicit-self-generic.rs
+++ b/src/test/run-pass/explicit-self-generic.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 /**
  * A function that returns a hash of a value
diff --git a/src/test/run-pass/expr-repeat-vstore.rs b/src/test/run-pass/expr-repeat-vstore.rs
index e48abc57534..57587936022 100644
--- a/src/test/run-pass/expr-repeat-vstore.rs
+++ b/src/test/run-pass/expr-repeat-vstore.rs
@@ -1,4 +1,4 @@
-use core::io::println;
+use std::io::println;
 
 fn main() {
     let v: ~[int] = ~[ 1, ..5 ];
diff --git a/src/test/run-pass/extern-mod-syntax.rs b/src/test/run-pass/extern-mod-syntax.rs
index c98b5ebc238..0db61fc8cd5 100644
--- a/src/test/run-pass/extern-mod-syntax.rs
+++ b/src/test/run-pass/extern-mod-syntax.rs
@@ -10,8 +10,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::json::Object;
+extern mod extra;
+use extra::json::Object;
 
 pub fn main() {
     io::println("Hello world!");
diff --git a/src/test/run-pass/float-nan.rs b/src/test/run-pass/float-nan.rs
index 4ea1604a18c..29a180db185 100644
--- a/src/test/run-pass/float-nan.rs
+++ b/src/test/run-pass/float-nan.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
-use core::num::Float;
+use std::num::Float;
 
 pub fn main() {
   let nan = Float::NaN::<float>();
diff --git a/src/test/run-pass/fn-bare-size.rs b/src/test/run-pass/fn-bare-size.rs
index 424d829b5ea..dc47dda420c 100644
--- a/src/test/run-pass/fn-bare-size.rs
+++ b/src/test/run-pass/fn-bare-size.rs
@@ -10,7 +10,7 @@
 
 // xfail-test
 
-extern mod std;
+extern mod extra;
 
 pub fn main() {
     // Bare functions should just be a pointer
diff --git a/src/test/run-pass/foreign-call-no-runtime.rs b/src/test/run-pass/foreign-call-no-runtime.rs
index 6f94b163315..67efca194d5 100644
--- a/src/test/run-pass/foreign-call-no-runtime.rs
+++ b/src/test/run-pass/foreign-call-no-runtime.rs
@@ -1,4 +1,4 @@
-use core::unstable::run_in_bare_thread;
+use std::unstable::run_in_bare_thread;
 
 extern {
     pub fn rust_dbg_call(cb: extern "C" fn(libc::uintptr_t)
diff --git a/src/test/run-pass/foreign-fn-linkname.rs b/src/test/run-pass/foreign-fn-linkname.rs
index 3b00b329feb..15e14e3abe5 100644
--- a/src/test/run-pass/foreign-fn-linkname.rs
+++ b/src/test/run-pass/foreign-fn-linkname.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 mod libc {
     #[nolink]
diff --git a/src/test/run-pass/foreign2.rs b/src/test/run-pass/foreign2.rs
index f83d21e1714..2745ae4014b 100644
--- a/src/test/run-pass/foreign2.rs
+++ b/src/test/run-pass/foreign2.rs
@@ -24,8 +24,8 @@ mod libc {
     #[abi = "cdecl"]
     #[nolink]
     pub extern {
-        pub fn write(fd: int, buf: *u8, count: ::core::libc::size_t)
-                  -> ::core::libc::ssize_t;
+        pub fn write(fd: int, buf: *u8, count: ::std::libc::size_t)
+                  -> ::std::libc::ssize_t;
     }
 }
 
diff --git a/src/test/run-pass/getopts_ref.rs b/src/test/run-pass/getopts_ref.rs
index afd018de3bb..5abef9e5f89 100644
--- a/src/test/run-pass/getopts_ref.rs
+++ b/src/test/run-pass/getopts_ref.rs
@@ -10,9 +10,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
-use std::getopts::*;
+use extra::getopts::*;
 
 pub fn main() {
     let args = ~[];
diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs
index c6ae2047147..fb82e93047d 100644
--- a/src/test/run-pass/hashmap-memory.rs
+++ b/src/test/run-pass/hashmap-memory.rs
@@ -19,8 +19,8 @@
 pub fn map(filename: ~str, emit: map_reduce::putter) { emit(filename, ~"1"); }
 
 mod map_reduce {
-    use core::hashmap::HashMap;
-    use core::comm::*;
+    use std::hashmap::HashMap;
+    use std::comm::*;
 
     pub type putter = @fn(~str, ~str);
 
diff --git a/src/test/run-pass/import-glob-crate.rs b/src/test/run-pass/import-glob-crate.rs
index de25ec42c29..0e95ee25c42 100644
--- a/src/test/run-pass/import-glob-crate.rs
+++ b/src/test/run-pass/import-glob-crate.rs
@@ -11,8 +11,8 @@
 // except according to those terms.
 
 
-extern mod std;
-use core::vec::*;
+extern mod extra;
+use std::vec::*;
 
 pub fn main() {
     let mut v = from_elem(0u, 0);
diff --git a/src/test/run-pass/import-in-block.rs b/src/test/run-pass/import-in-block.rs
index 659b7b5be6f..9537162e1c8 100644
--- a/src/test/run-pass/import-in-block.rs
+++ b/src/test/run-pass/import-in-block.rs
@@ -9,10 +9,10 @@
 // except according to those terms.
 
 pub fn main() {
-    use core::vec::from_fn;
-    debug!(::core::vec::len(from_fn(2, |i| i)));
+    use std::vec::from_fn;
+    debug!(::std::vec::len(from_fn(2, |i| i)));
     {
-        use core::vec::*;
+        use std::vec::*;
         debug!(len(~[2]));
     }
 }
diff --git a/src/test/run-pass/infinite-loops.rs b/src/test/run-pass/infinite-loops.rs
index b2ed6d95c20..dea0df2e52b 100644
--- a/src/test/run-pass/infinite-loops.rs
+++ b/src/test/run-pass/infinite-loops.rs
@@ -14,7 +14,7 @@
 */
 // xfail-test
 
-extern mod std;
+extern mod extra;
 
 fn loopy(n: int) {
     if n > 0 { do spawn { loopy(n - 1) }; do spawn { loopy(n - 1) }; }
diff --git a/src/test/run-pass/intrinsics-integer.rs b/src/test/run-pass/intrinsics-integer.rs
index e4d84808673..6be47b1e88b 100644
--- a/src/test/run-pass/intrinsics-integer.rs
+++ b/src/test/run-pass/intrinsics-integer.rs
@@ -10,7 +10,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 mod rusti {
     #[abi = "rust-intrinsic"]
diff --git a/src/test/run-pass/issue-1696.rs b/src/test/run-pass/issue-1696.rs
index 5b40d0abff8..d531217e550 100644
--- a/src/test/run-pass/issue-1696.rs
+++ b/src/test/run-pass/issue-1696.rs
@@ -10,7 +10,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::hashmap::HashMap;
+use std::hashmap::HashMap;
 
 pub fn main() {
     let mut m = HashMap::new();
diff --git a/src/test/run-pass/issue-2101.rs b/src/test/run-pass/issue-2101.rs
index 4564e089147..423888c1cf5 100644
--- a/src/test/run-pass/issue-2101.rs
+++ b/src/test/run-pass/issue-2101.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // xfail-test
-extern mod std;
-use std::arena;
-use std::arena::Arena;
+extern mod extra;
+use extra::arena;
+use extra::arena::Arena;
 
 enum hold { s(str) }
 
diff --git a/src/test/run-pass/issue-2214.rs b/src/test/run-pass/issue-2214.rs
index 8e4309e08e4..93cc8c292b1 100644
--- a/src/test/run-pass/issue-2214.rs
+++ b/src/test/run-pass/issue-2214.rs
@@ -10,9 +10,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cast;
-use core::libc::{c_double, c_int};
-use core::f64::*;
+use std::cast;
+use std::libc::{c_double, c_int};
+use std::f64::*;
 
 fn to_c_int(v: &mut int) -> &mut c_int {
     unsafe {
@@ -27,7 +27,7 @@ fn lgamma(n: c_double, value: &mut int) -> c_double {
 }
 
 mod m {
-    use core::libc::{c_double, c_int};
+    use std::libc::{c_double, c_int};
 
     #[link_name = "m"]
     #[abi = "cdecl"]
diff --git a/src/test/run-pass/issue-2383.rs b/src/test/run-pass/issue-2383.rs
index a7afa1d6f34..9d870168802 100644
--- a/src/test/run-pass/issue-2383.rs
+++ b/src/test/run-pass/issue-2383.rs
@@ -10,8 +10,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::deque::Deque;
+extern mod extra;
+use extra::deque::Deque;
 
 pub fn main() {
     let mut q = Deque::new();
diff --git a/src/test/run-pass/issue-2611.rs b/src/test/run-pass/issue-2611.rs
index f24605339ad..3d4bed4b62f 100644
--- a/src/test/run-pass/issue-2611.rs
+++ b/src/test/run-pass/issue-2611.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::old_iter::BaseIter;
+use std::old_iter::BaseIter;
 
 trait FlatMapToVec<A> {
   fn flat_map_to_vec<B, IB:BaseIter<B>>(&self, op: &fn(&A) -> IB) -> ~[B];
diff --git a/src/test/run-pass/issue-2631-b.rs b/src/test/run-pass/issue-2631-b.rs
index f6e40fa247d..3ceae103056 100644
--- a/src/test/run-pass/issue-2631-b.rs
+++ b/src/test/run-pass/issue-2631-b.rs
@@ -14,7 +14,7 @@
 extern mod req;
 
 use req::*;
-use core::hashmap::HashMap;
+use std::hashmap::HashMap;
 
 pub fn main() {
   let v = ~[@~"hi"];
diff --git a/src/test/run-pass/issue-2718.rs b/src/test/run-pass/issue-2718.rs
index 55be1056eca..48599b2a538 100644
--- a/src/test/run-pass/issue-2718.rs
+++ b/src/test/run-pass/issue-2718.rs
@@ -10,12 +10,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::util;
+use std::util;
 
 // tjc: I don't know why
 pub mod pipes {
-    use core::util;
-    use core::cast::{forget, transmute};
+    use std::util;
+    use std::cast::{forget, transmute};
 
     pub struct Stuff<T> {
         state: state,
@@ -54,7 +54,7 @@ pub mod pipes {
       pub fn atomic_xchg_rel(_dst: &mut int, _src: int) -> int { fail!(); }
     }
 
-    // We should consider moving this to ::core::unsafe, although I
+    // We should consider moving this to ::std::unsafe, although I
     // suspect graydon would want us to use void pointers instead.
     pub unsafe fn uniquify<T>(x: *T) -> ~T {
         unsafe { cast::transmute(x) }
@@ -219,9 +219,9 @@ pub mod pipes {
 }
 
 pub mod pingpong {
-    use core::cast;
-    use core::ptr;
-    use core::util;
+    use std::cast;
+    use std::ptr;
+    use std::util;
 
     pub struct ping(::pipes::send_packet<pong>);
     pub struct pong(::pipes::send_packet<ping>);
@@ -253,7 +253,7 @@ pub mod pingpong {
     }
 
     pub mod client {
-        use core::option;
+        use std::option;
         use pingpong;
 
         pub type ping = ::pipes::send_packet<pingpong::ping>;
diff --git a/src/test/run-pass/issue-2804-2.rs b/src/test/run-pass/issue-2804-2.rs
index b25e4095b18..917839a5401 100644
--- a/src/test/run-pass/issue-2804-2.rs
+++ b/src/test/run-pass/issue-2804-2.rs
@@ -13,7 +13,7 @@
 // Minimized version of issue-2804.rs. Both check that callee IDs don't
 // clobber the previous node ID in a macro expr
 
-use core::hashmap::HashMap;
+use std::hashmap::HashMap;
 
 fn add_interfaces(managed_ip: ~str, device: HashMap<~str, int>)  {
      error!("%s, %?", managed_ip, device.get(&~"interfaces"));
diff --git a/src/test/run-pass/issue-2804.rs b/src/test/run-pass/issue-2804.rs
index 4614c26fa5f..bb2dbb9fe21 100644
--- a/src/test/run-pass/issue-2804.rs
+++ b/src/test/run-pass/issue-2804.rs
@@ -10,9 +10,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use core::hashmap::HashMap;
-use std::json;
+extern mod extra;
+use std::hashmap::HashMap;
+use extra::json;
 
 enum object {
     bool_value(bool),
@@ -23,7 +23,7 @@ fn lookup(table: ~json::Object, key: ~str, default: ~str) -> ~str
 {
     match table.find(&key)
     {
-        option::Some(&std::json::String(copy s)) =>
+        option::Some(&extra::json::String(copy s)) =>
         {
             copy s
         }
@@ -39,11 +39,11 @@ fn lookup(table: ~json::Object, key: ~str, default: ~str) -> ~str
     }
 }
 
-fn add_interface(store: int, managed_ip: ~str, data: std::json::Json) -> (~str, object)
+fn add_interface(store: int, managed_ip: ~str, data: extra::json::Json) -> (~str, object)
 {
     match &data
     {
-        &std::json::Object(copy interface) =>
+        &extra::json::Object(copy interface) =>
         {
             let name = lookup(copy interface, ~"ifDescr", ~"");
             let label = fmt!("%s-%s", managed_ip, name);
@@ -58,11 +58,11 @@ fn add_interface(store: int, managed_ip: ~str, data: std::json::Json) -> (~str,
     }
 }
 
-fn add_interfaces(store: int, managed_ip: ~str, device: HashMap<~str, std::json::Json>) -> ~[(~str, object)]
+fn add_interfaces(store: int, managed_ip: ~str, device: HashMap<~str, extra::json::Json>) -> ~[(~str, object)]
 {
     match device.get(&~"interfaces")
     {
-        &std::json::List(ref interfaces) =>
+        &extra::json::List(ref interfaces) =>
         {
           do interfaces.map |interface| {
                 add_interface(store, copy managed_ip, copy *interface)
diff --git a/src/test/run-pass/issue-2904.rs b/src/test/run-pass/issue-2904.rs
index 9ea8caef7bc..1cb8a74e5a4 100644
--- a/src/test/run-pass/issue-2904.rs
+++ b/src/test/run-pass/issue-2904.rs
@@ -12,9 +12,9 @@
 
 /// Map representation
 
-extern mod std;
+extern mod extra;
 
-use core::io::ReaderUtil;
+use std::io::ReaderUtil;
 
 enum square {
     bot,
diff --git a/src/test/run-pass/issue-2989.rs b/src/test/run-pass/issue-2989.rs
index 5aaa3e595e1..8ef67840ba3 100644
--- a/src/test/run-pass/issue-2989.rs
+++ b/src/test/run-pass/issue-2989.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 trait methods {
     fn to_bytes(&self) -> ~[u8];
diff --git a/src/test/run-pass/issue-3026.rs b/src/test/run-pass/issue-3026.rs
index 16e9b4753f8..a4b37f0ba0f 100644
--- a/src/test/run-pass/issue-3026.rs
+++ b/src/test/run-pass/issue-3026.rs
@@ -10,7 +10,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::hashmap::HashMap;
+use std::hashmap::HashMap;
 
 pub fn main() {
     let mut buggy_map: HashMap<uint, &uint> = HashMap::new::<uint, &uint>();
diff --git a/src/test/run-pass/issue-3176.rs b/src/test/run-pass/issue-3176.rs
index d22c7e82ad5..54094a0c008 100644
--- a/src/test/run-pass/issue-3176.rs
+++ b/src/test/run-pass/issue-3176.rs
@@ -10,7 +10,7 @@
 
 // xfail-fast
 
-use core::comm::{Select2, Selectable};
+use std::comm::{Select2, Selectable};
 
 pub fn main() {
     let (p,c) = comm::stream();
diff --git a/src/test/run-pass/issue-3424.rs b/src/test/run-pass/issue-3424.rs
index 70a01f8cf02..a6eb5097b36 100644
--- a/src/test/run-pass/issue-3424.rs
+++ b/src/test/run-pass/issue-3424.rs
@@ -11,8 +11,8 @@
 // except according to those terms.
 
 // rustc --test ignores2.rs && ./ignores2
-extern mod std;
-use core::path::{Path};
+extern mod extra;
+use std::path::{Path};
 
 type rsrc_loader = ~fn(path: &Path) -> result::Result<~str, ~str>;
 
diff --git a/src/test/run-pass/issue-3556.rs b/src/test/run-pass/issue-3556.rs
index ff2fa80102b..ca67f1dae43 100644
--- a/src/test/run-pass/issue-3556.rs
+++ b/src/test/run-pass/issue-3556.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use core::io::WriterUtil;
+extern mod extra;
+use std::io::WriterUtil;
 
 enum Token {
         Text(@~str),
diff --git a/src/test/run-pass/issue-3559.rs b/src/test/run-pass/issue-3559.rs
index b3f3aed9ea1..9665da11b93 100644
--- a/src/test/run-pass/issue-3559.rs
+++ b/src/test/run-pass/issue-3559.rs
@@ -11,9 +11,9 @@
 // except according to those terms.
 
 // rustc --test map_to_str.rs && ./map_to_str
-extern mod std;
+extern mod extra;
 
-use core::io::{WriterUtil};
+use std::io::{WriterUtil};
 
 fn check_strs(actual: &str, expected: &str) -> bool
 {
@@ -27,7 +27,7 @@ fn check_strs(actual: &str, expected: &str) -> bool
 
 fn tester()
 {
-    let mut table = core::hashmap::HashMap::new();
+    let mut table = std::hashmap::HashMap::new();
     table.insert(@~"one", 1);
     table.insert(@~"two", 2);
     assert!(check_strs(table.to_str(), ~"xxx"));   // not sure what expected should be
diff --git a/src/test/run-pass/issue-3563-3.rs b/src/test/run-pass/issue-3563-3.rs
index 96925a97a10..bfdf4aa053d 100644
--- a/src/test/run-pass/issue-3563-3.rs
+++ b/src/test/run-pass/issue-3563-3.rs
@@ -12,15 +12,15 @@
 // Demonstrates traits, impls, operator overloading, non-copyable struct, unit testing.
 // To run execute: rustc --test shapes.rs && ./shapes
 
-// Rust's core library is tightly bound to the language itself so it is automatically linked in.
-// However the std library is designed to be optional (for code that must run on constrained
+// Rust's std library is tightly bound to the language itself so it is automatically linked in.
+// However the extra library is designed to be optional (for code that must run on constrained
 //  environments like embedded devices or special environments like kernel code) so it must
 // be explicitly linked in.
-extern mod std;
+extern mod extra;
 
 // Extern mod controls linkage. Use controls the visibility of names to modules that are
 // already linked in. Using WriterUtil allows us to use the write_line method.
-use core::io::WriterUtil;
+use std::io::WriterUtil;
 
 // Represents a position on a canvas.
 struct Point {
diff --git a/src/test/run-pass/issue-3574.rs b/src/test/run-pass/issue-3574.rs
index db937e74503..dc1ce95cfae 100644
--- a/src/test/run-pass/issue-3574.rs
+++ b/src/test/run-pass/issue-3574.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // rustc --test match_borrowed_str.rs.rs && ./match_borrowed_str.rs
-extern mod std;
+extern mod extra;
 
 fn compare(x: &str, y: &str) -> bool
 {
diff --git a/src/test/run-pass/issue-3609.rs b/src/test/run-pass/issue-3609.rs
index 6c26ac3f65e..a1aced7b5df 100644
--- a/src/test/run-pass/issue-3609.rs
+++ b/src/test/run-pass/issue-3609.rs
@@ -1,6 +1,6 @@
-extern mod std;
+extern mod extra;
 
-use core::comm::Chan;
+use std::comm::Chan;
 
 type RingBuffer = ~[float];
 type SamplesFn = ~fn(samples: &RingBuffer);
diff --git a/src/test/run-pass/issue-3656.rs b/src/test/run-pass/issue-3656.rs
index 895e90beef4..96cf88a0e2b 100644
--- a/src/test/run-pass/issue-3656.rs
+++ b/src/test/run-pass/issue-3656.rs
@@ -13,7 +13,7 @@
 // Incorrect struct size computation in the FFI, because of not taking
 // the alignment of elements into account.
 
-use core::libc::*;
+use std::libc::*;
 
 struct KEYGEN {
     hash_algorithm: [c_uint, ..2],
diff --git a/src/test/run-pass/issue-4016.rs b/src/test/run-pass/issue-4016.rs
index 2384b0e8593..4e65a7063e7 100644
--- a/src/test/run-pass/issue-4016.rs
+++ b/src/test/run-pass/issue-4016.rs
@@ -9,11 +9,11 @@
 // except according to those terms.
 
 // xfail-test
-extern mod std;
+extern mod extra;
 
 use hashmap;
-use std::json;
-use std::serialization::{Deserializable, deserialize};
+use extra::json;
+use extra::serialization::{Deserializable, deserialize};
 
 trait JD : Deserializable<json::Deserializer> { }
 //type JD = Deserializable<json::Deserializer>;
diff --git a/src/test/run-pass/issue-4036.rs b/src/test/run-pass/issue-4036.rs
index 8b514b11625..ad820712595 100644
--- a/src/test/run-pass/issue-4036.rs
+++ b/src/test/run-pass/issue-4036.rs
@@ -11,9 +11,9 @@
 // Issue #4036: Test for an issue that arose around fixing up type inference
 // byproducts in vtable records.
 
-extern mod std;
-use self::std::json;
-use self::std::serialize;
+extern mod extra;
+use self::extra::json;
+use self::extra::serialize;
 
 pub fn main() {
     let json = json::from_str("[1]").unwrap();
diff --git a/src/test/run-pass/issue-4092.rs b/src/test/run-pass/issue-4092.rs
index e129e0a8868..919c1f7ad18 100644
--- a/src/test/run-pass/issue-4092.rs
+++ b/src/test/run-pass/issue-4092.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::hashmap::HashMap;
+use std::hashmap::HashMap;
 
 pub fn main() {
     let mut x = HashMap::new();
diff --git a/src/test/run-pass/issue-4241.rs b/src/test/run-pass/issue-4241.rs
index 5503441771c..4aa604160d9 100644
--- a/src/test/run-pass/issue-4241.rs
+++ b/src/test/run-pass/issue-4241.rs
@@ -9,11 +9,11 @@
 // except according to those terms.
 
 // xfail-test
-extern mod std;
+extern mod extra;
 
-use std::net::tcp::TcpSocketBuf;
+use extra::net::tcp::TcpSocketBuf;
 
-use core::io::{ReaderUtil,WriterUtil};
+use std::io::{ReaderUtil,WriterUtil};
 
 enum Result {
   Nil,
diff --git a/src/test/run-pass/issue-4541.rs b/src/test/run-pass/issue-4541.rs
index 37e91cf1eb2..24a8adfcb1a 100644
--- a/src/test/run-pass/issue-4541.rs
+++ b/src/test/run-pass/issue-4541.rs
@@ -10,7 +10,7 @@
 
 // xfail-test
 fn parse_args() -> ~str {
-    let args = core::os::args();
+    let args = std::os::args();
     let mut n = 0;
 
     while n < args.len() {
diff --git a/src/test/run-pass/item-attributes.rs b/src/test/run-pass/item-attributes.rs
index c616d46a833..5a1d54c48b5 100644
--- a/src/test/run-pass/item-attributes.rs
+++ b/src/test/run-pass/item-attributes.rs
@@ -17,10 +17,10 @@
 #[attr4(attr5)];
 
 // Special linkage attributes for the crate
-#[link(name = "std",
+#[link(name = "extra",
        vers = "0.1",
        uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
-       url = "http://rust-lang.org/src/std")];
+       url = "http://rust-lang.org/src/extra")];
 
 // These are are attributes of the following mod
 #[attr1 = "val"]
@@ -148,7 +148,7 @@ mod test_attr_inner_then_outer_multi {
 }
 
 mod test_distinguish_syntax_ext {
-    extern mod std;
+    extern mod extra;
 
     pub fn f() {
         fmt!("test%s", ~"s");
diff --git a/src/test/run-pass/ivec-tag.rs b/src/test/run-pass/ivec-tag.rs
index 017d90cbcd7..5b1102a1917 100644
--- a/src/test/run-pass/ivec-tag.rs
+++ b/src/test/run-pass/ivec-tag.rs
@@ -1,4 +1,4 @@
-use core::comm::*;
+use std::comm::*;
 
 fn producer(c: &Chan<~[u8]>) {
     c.send(
diff --git a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
index 2cddc510422..ae2ae6dbf9c 100644
--- a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
+++ b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
@@ -10,8 +10,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::list;
+extern mod extra;
+use extra::list;
 
 enum foo {
   a(uint),
diff --git a/src/test/run-pass/lots-a-fail.rs b/src/test/run-pass/lots-a-fail.rs
index ed9e6e54030..4eb0cd81bc3 100644
--- a/src/test/run-pass/lots-a-fail.rs
+++ b/src/test/run-pass/lots-a-fail.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32 leaks
-extern mod std;
+extern mod extra;
 
 fn die() {
     fail!();
diff --git a/src/test/run-pass/mlist-cycle.rs b/src/test/run-pass/mlist-cycle.rs
index a67f1574f64..cb33feef539 100644
--- a/src/test/run-pass/mlist-cycle.rs
+++ b/src/test/run-pass/mlist-cycle.rs
@@ -10,9 +10,9 @@
 
 // xfail-test
 // -*- rust -*-
-extern mod core;
-use core::gc;
-use core::gc::rustrt;
+extern mod std;
+use std::gc;
+use std::gc::rustrt;
 
 struct cell {c: @list}
 
diff --git a/src/test/run-pass/mod-view-items.rs b/src/test/run-pass/mod-view-items.rs
index 7dbcb72f1ea..2fc2d4b3716 100644
--- a/src/test/run-pass/mod-view-items.rs
+++ b/src/test/run-pass/mod-view-items.rs
@@ -17,7 +17,7 @@
 // begin failing.
 
 mod m {
-    use core::vec;
+    use std::vec;
     pub fn f() -> ~[int] { vec::from_elem(1u, 0) }
 }
 
diff --git a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs b/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs
index 90b3e623f5e..efbf9302117 100644
--- a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs
+++ b/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 trait Serializer {
 }
diff --git a/src/test/run-pass/morestack5.rs b/src/test/run-pass/morestack5.rs
index e1561db8b91..492196ed7f0 100644
--- a/src/test/run-pass/morestack5.rs
+++ b/src/test/run-pass/morestack5.rs
@@ -10,7 +10,7 @@
 
 // This test will call __morestack with various minimum stack sizes
 
-extern mod std;
+extern mod extra;
 
 fn getbig(i: int) {
     if i != 0 {
diff --git a/src/test/run-pass/morestack6.rs b/src/test/run-pass/morestack6.rs
index dafdd0fba48..79c66ba72b0 100644
--- a/src/test/run-pass/morestack6.rs
+++ b/src/test/run-pass/morestack6.rs
@@ -54,7 +54,7 @@ fn runtest2(f: extern fn(), frame_backoff: u32, last_stk: *u8) -> u32 {
 }
 
 pub fn main() {
-    use core::rand::Rng;
+    use std::rand::Rng;
     let fns = ~[
         calllink01,
         calllink02,
diff --git a/src/test/run-pass/move-3-unique.rs b/src/test/run-pass/move-3-unique.rs
index dcd4cc9a7ea..7b71fc4f86e 100644
--- a/src/test/run-pass/move-3-unique.rs
+++ b/src/test/run-pass/move-3-unique.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 struct Triple { x: int, y: int, z: int }
 
diff --git a/src/test/run-pass/move-3.rs b/src/test/run-pass/move-3.rs
index 42955b94721..64519034ebe 100644
--- a/src/test/run-pass/move-3.rs
+++ b/src/test/run-pass/move-3.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 struct Triple { x: int, y: int, z: int }
 
diff --git a/src/test/run-pass/move-4-unique.rs b/src/test/run-pass/move-4-unique.rs
index 2ed3523ef86..48621cf03be 100644
--- a/src/test/run-pass/move-4-unique.rs
+++ b/src/test/run-pass/move-4-unique.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 struct Triple {a: int, b: int, c: int}
 
diff --git a/src/test/run-pass/move-4.rs b/src/test/run-pass/move-4.rs
index cd88b679361..2f0f256ba78 100644
--- a/src/test/run-pass/move-4.rs
+++ b/src/test/run-pass/move-4.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 
-extern mod std;
+extern mod extra;
 
 struct Triple { a: int, b: int, c: int }
 
diff --git a/src/test/run-pass/mutable-alias-vec.rs b/src/test/run-pass/mutable-alias-vec.rs
index 42c623ec41c..b058df7fc7a 100644
--- a/src/test/run-pass/mutable-alias-vec.rs
+++ b/src/test/run-pass/mutable-alias-vec.rs
@@ -11,7 +11,7 @@
 
 
 // -*- rust -*-
-extern mod std;
+extern mod extra;
 
 fn grow(v: &mut ~[int]) { *v += ~[1]; }
 
diff --git a/src/test/run-pass/new-import-syntax.rs b/src/test/run-pass/new-import-syntax.rs
index 1390ae5f7eb..c7497bf3de5 100644
--- a/src/test/run-pass/new-import-syntax.rs
+++ b/src/test/run-pass/new-import-syntax.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::io::println;
+use std::io::println;
 
 pub fn main() {
     println("Hello world!");
diff --git a/src/test/run-pass/new-style-constants.rs b/src/test/run-pass/new-style-constants.rs
index 6fe4a88d071..2da532422c0 100644
--- a/src/test/run-pass/new-style-constants.rs
+++ b/src/test/run-pass/new-style-constants.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::io::println;
+use std::io::println;
 
 static FOO: int = 3;
 
diff --git a/src/test/run-pass/new-style-fixed-length-vec.rs b/src/test/run-pass/new-style-fixed-length-vec.rs
index 6eea23f6b2b..41704c252c8 100644
--- a/src/test/run-pass/new-style-fixed-length-vec.rs
+++ b/src/test/run-pass/new-style-fixed-length-vec.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::io::println;
+use std::io::println;
 
 static FOO: [int, ..3] = [1, 2, 3];
 
diff --git a/src/test/run-pass/newtype-struct-with-dtor.rs b/src/test/run-pass/newtype-struct-with-dtor.rs
index eb3b74553b7..0e36f27aa92 100644
--- a/src/test/run-pass/newtype-struct-with-dtor.rs
+++ b/src/test/run-pass/newtype-struct-with-dtor.rs
@@ -1,5 +1,5 @@
-use core::libc::c_int;
-use core::libc;
+use std::libc::c_int;
+use std::libc;
 
 pub struct Fd(c_int);
 
diff --git a/src/test/run-pass/non-boolean-pure-fns.rs b/src/test/run-pass/non-boolean-pure-fns.rs
index 58ac4fc576d..c08f52cba15 100644
--- a/src/test/run-pass/non-boolean-pure-fns.rs
+++ b/src/test/run-pass/non-boolean-pure-fns.rs
@@ -10,9 +10,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
-use std::list::*;
+use extra::list::*;
 
 fn pure_length_go<T:Copy>(ls: @List<T>, acc: uint) -> uint {
     match *ls { Nil => { acc } Cons(_, tl) => { pure_length_go(tl, acc + 1u) } }
diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/run-pass/nullable-pointer-iotareduction.rs
index 6ec20549963..b63870dcfb6 100644
--- a/src/test/run-pass/nullable-pointer-iotareduction.rs
+++ b/src/test/run-pass/nullable-pointer-iotareduction.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::{option, cast};
+use std::{option, cast};
 
 // Iota-reduction is a rule in the Calculus of (Co-)Inductive Constructions,
 // which "says that a destructor applied to an object built from a constructor
diff --git a/src/test/run-pass/overload-index-operator.rs b/src/test/run-pass/overload-index-operator.rs
index 497c17d0459..1838cfe2519 100644
--- a/src/test/run-pass/overload-index-operator.rs
+++ b/src/test/run-pass/overload-index-operator.rs
@@ -11,7 +11,7 @@
 // Test overloading of the `[]` operator.  In particular test that it
 // takes its argument *by reference*.
 
-use core::ops::Index;
+use std::ops::Index;
 
 struct AssociationList<K,V> {
     pairs: ~[AssociationPair<K,V>]
diff --git a/src/test/run-pass/pipe-bank-proto.rs b/src/test/run-pass/pipe-bank-proto.rs
index 26395e7307f..83031b46704 100644
--- a/src/test/run-pass/pipe-bank-proto.rs
+++ b/src/test/run-pass/pipe-bank-proto.rs
@@ -15,8 +15,8 @@
 //
 // http://theincredibleholk.wordpress.com/2012/07/06/rusty-pipes/
 
-use core::pipes;
-use core::pipes::try_recv;
+use std::pipes;
+use std::pipes::try_recv;
 
 pub type username = ~str;
 pub type password = ~str;
diff --git a/src/test/run-pass/pipe-detect-term.rs b/src/test/run-pass/pipe-detect-term.rs
index 55e43075204..d922eef5dbb 100644
--- a/src/test/run-pass/pipe-detect-term.rs
+++ b/src/test/run-pass/pipe-detect-term.rs
@@ -14,12 +14,12 @@
 
 // xfail-win32
 
-extern mod std;
-use std::timer::sleep;
-use std::uv;
+extern mod extra;
+use extra::timer::sleep;
+use extra::uv;
 
-use core::cell::Cell;
-use core::pipes::{try_recv, recv};
+use std::cell::Cell;
+use std::pipes::{try_recv, recv};
 
 proto! oneshot (
     waiting:send {
diff --git a/src/test/run-pass/pipe-peek.rs b/src/test/run-pass/pipe-peek.rs
index 985eaecdc78..149e81204f4 100644
--- a/src/test/run-pass/pipe-peek.rs
+++ b/src/test/run-pass/pipe-peek.rs
@@ -10,10 +10,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::timer::sleep;
-use std::uv;
-use core::pipes;
+extern mod extra;
+use extra::timer::sleep;
+use extra::uv;
+use std::pipes;
 
 proto! oneshot (
     waiting:send {
diff --git a/src/test/run-pass/pipe-pingpong-bounded.rs b/src/test/run-pass/pipe-pingpong-bounded.rs
index 3c37371a537..b4c92dc0614 100644
--- a/src/test/run-pass/pipe-pingpong-bounded.rs
+++ b/src/test/run-pass/pipe-pingpong-bounded.rs
@@ -14,15 +14,15 @@
 // experiment with what code the compiler should generate for bounded
 // protocols.
 
-use core::cell::Cell;
+use std::cell::Cell;
 
 // This was generated initially by the pipe compiler, but it's been
 // modified in hopefully straightforward ways.
 
 mod pingpong {
-    use core::pipes;
-    use core::pipes::*;
-    use core::ptr;
+    use std::pipes;
+    use std::pipes::*;
+    use std::ptr;
 
     pub struct Packets {
         ping: Packet<ping>,
@@ -46,9 +46,9 @@ mod pingpong {
     pub struct ping(server::pong);
     pub struct pong(client::ping);
     pub mod client {
-        use core::pipes;
-        use core::pipes::*;
-        use core::ptr;
+        use std::pipes;
+        use std::pipes::*;
+        use std::ptr;
 
         pub fn ping(mut pipe: ping) -> pong {
             {
@@ -66,9 +66,9 @@ mod pingpong {
                                                   ::pingpong::Packets>;
     }
     pub mod server {
-        use core::pipes;
-        use core::pipes::*;
-        use core::ptr;
+        use std::pipes;
+        use std::pipes::*;
+        use std::ptr;
 
         pub type ping = pipes::RecvPacketBuffered<::pingpong::ping,
         ::pingpong::Packets>;
@@ -88,7 +88,7 @@ mod pingpong {
 }
 
 mod test {
-    use core::pipes::recv;
+    use std::pipes::recv;
     use pingpong::{ping, pong};
 
     pub fn client(chan: ::pingpong::client::ping) {
diff --git a/src/test/run-pass/pipe-pingpong-proto.rs b/src/test/run-pass/pipe-pingpong-proto.rs
index 5978438ef76..95502b14c53 100644
--- a/src/test/run-pass/pipe-pingpong-proto.rs
+++ b/src/test/run-pass/pipe-pingpong-proto.rs
@@ -12,8 +12,8 @@
 
 // An example to make sure the protocol parsing syntax extension works.
 
-use core::cell::Cell;
-use core::option;
+use std::cell::Cell;
+use std::option;
 
 proto! pingpong (
     ping:send {
@@ -26,7 +26,7 @@ proto! pingpong (
 )
 
 mod test {
-    use core::pipes::recv;
+    use std::pipes::recv;
     use pingpong::{ping, pong};
 
     pub fn client(chan: ::pingpong::client::ping) {
diff --git a/src/test/run-pass/pipe-presentation-examples.rs b/src/test/run-pass/pipe-presentation-examples.rs
index fcfd77dab0a..54cf8ba9c0a 100644
--- a/src/test/run-pass/pipe-presentation-examples.rs
+++ b/src/test/run-pass/pipe-presentation-examples.rs
@@ -21,7 +21,7 @@
 
 use double_buffer::client::*;
 use double_buffer::give_buffer;
-use core::comm::Selectable;
+use std::comm::Selectable;
 
 macro_rules! select_if (
     {
@@ -37,7 +37,7 @@ macro_rules! select_if (
         ], )*
     } => {
         if $index == $count {
-            match core::pipes::try_recv($port) {
+            match std::pipes::try_recv($port) {
               $(Some($message($($($x,)+)* next)) => {
                 let $next = next;
                 $e
@@ -71,7 +71,7 @@ macro_rules! select (
               -> $next:ident $e:expr),+
         } )+
     } => ({
-        let index = core::comm::selecti([$(($port).header()),+]);
+        let index = std::comm::selecti([$(($port).header()),+]);
         select_if!(index, 0, $( $port => [
             $($message$(($($x),+))dont_type_this* -> $next $e),+
         ], )+)
diff --git a/src/test/run-pass/pipe-select.rs b/src/test/run-pass/pipe-select.rs
index 7e0a59f57fc..a386c3a2e05 100644
--- a/src/test/run-pass/pipe-select.rs
+++ b/src/test/run-pass/pipe-select.rs
@@ -13,13 +13,13 @@
 // xfail-pretty
 // xfail-win32
 
-extern mod std;
-use std::timer::sleep;
-use std::uv;
+extern mod extra;
+use extra::timer::sleep;
+use extra::uv;
 
-use core::cell::Cell;
-use core::pipes;
-use core::pipes::*;
+use std::cell::Cell;
+use std::pipes;
+use std::pipes::*;
 
 proto! oneshot (
     waiting:send {
diff --git a/src/test/run-pass/pipe-sleep.rs b/src/test/run-pass/pipe-sleep.rs
index da49a4303a6..674ad5f3405 100644
--- a/src/test/run-pass/pipe-sleep.rs
+++ b/src/test/run-pass/pipe-sleep.rs
@@ -10,12 +10,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::timer::sleep;
-use std::uv;
-use core::cell::Cell;
-use core::pipes;
-use core::pipes::*;
+extern mod extra;
+use extra::timer::sleep;
+use extra::uv;
+use std::cell::Cell;
+use std::pipes;
+use std::pipes::*;
 
 proto! oneshot (
     waiting:send {
diff --git a/src/test/run-pass/placement-new-arena.rs b/src/test/run-pass/placement-new-arena.rs
index ac5bc4f62d9..1dafbca22f7 100644
--- a/src/test/run-pass/placement-new-arena.rs
+++ b/src/test/run-pass/placement-new-arena.rs
@@ -10,8 +10,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::arena;
+extern mod extra;
+use extra::arena;
 
 pub fn main() {
     let mut arena = arena::Arena();
diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs
index 5255c13bead..9663beb279e 100644
--- a/src/test/run-pass/reflect-visit-data.rs
+++ b/src/test/run-pass/reflect-visit-data.rs
@@ -10,9 +10,9 @@
 
 // xfail-fast
 
-use core::bool;
-use core::libc::c_void;
-use core::vec::UnboxedVecRepr;
+use std::bool;
+use std::libc::c_void;
+use std::vec::UnboxedVecRepr;
 use intrinsic::{TyDesc, get_tydesc, visit_tydesc, TyVisitor, Opaque};
 
 #[doc = "High-level interfaces to `intrinsic::visit_ty` reflection system."]
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 a87a899cafe..33d147c22b6 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 core::util;
+use std::util;
 
 pub fn main() {
     let mut x = 4;
diff --git a/src/test/run-pass/ret-break-cont-in-block.rs b/src/test/run-pass/ret-break-cont-in-block.rs
index f1b1267faa7..9a547bd4bdf 100644
--- a/src/test/run-pass/ret-break-cont-in-block.rs
+++ b/src/test/run-pass/ret-break-cont-in-block.rs
@@ -10,7 +10,7 @@
 
 // xfail-fast
 
-use core::cmp::Eq;
+use std::cmp::Eq;
 
 fn iter<T>(v: ~[T], it: &fn(&T) -> bool) -> bool {
     let mut i = 0u, l = v.len();
diff --git a/src/test/run-pass/rt-sched-1.rs b/src/test/run-pass/rt-sched-1.rs
index 17c5994634f..a60b24987c8 100644
--- a/src/test/run-pass/rt-sched-1.rs
+++ b/src/test/run-pass/rt-sched-1.rs
@@ -10,7 +10,7 @@
 
 // Tests of the runtime's scheduler interface
 
-use core::comm::*;
+use std::comm::*;
 
 pub type sched_id = int;
 pub type task_id = *libc::c_void;
diff --git a/src/test/run-pass/send-iloop.rs b/src/test/run-pass/send-iloop.rs
index 18f4fd27858..ed0a5263035 100644
--- a/src/test/run-pass/send-iloop.rs
+++ b/src/test/run-pass/send-iloop.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-extern mod std;
+extern mod extra;
 
 fn die() {
     fail!();
diff --git a/src/test/run-pass/send-resource.rs b/src/test/run-pass/send-resource.rs
index 6bda62be621..17789e0b509 100644
--- a/src/test/run-pass/send-resource.rs
+++ b/src/test/run-pass/send-resource.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::*;
 
 struct test {
   f: int,
diff --git a/src/test/run-pass/send-type-inference.rs b/src/test/run-pass/send-type-inference.rs
index 734ef70a4b8..bdb1fbaf422 100644
--- a/src/test/run-pass/send-type-inference.rs
+++ b/src/test/run-pass/send-type-inference.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::*;
 
 // tests that ctrl's type gets inferred properly
 struct Command<K, V> {
diff --git a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs b/src/test/run-pass/sendfn-spawn-with-fn-arg.rs
index 9816849d808..19e85319927 100644
--- a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs
+++ b/src/test/run-pass/sendfn-spawn-with-fn-arg.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cell::Cell;
+use std::cell::Cell;
 
 pub fn main() { test05(); }
 
diff --git a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs
index 25ac00d174f..f29d0c6f108 100644
--- a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs
+++ b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs
@@ -14,9 +14,9 @@
 // on x86_64: when there is a enum embedded in an
 // interior record which is then itself interior to
 // something else, shape calculations were off.
-extern mod std;
-use std::list;
-use std::list::list;
+extern mod extra;
+use extra::list;
+use extra::list::list;
 
 enum opt_span {
 
diff --git a/src/test/run-pass/spawn-types.rs b/src/test/run-pass/spawn-types.rs
index eb1c082f2f2..58b7b8c09a5 100644
--- a/src/test/run-pass/spawn-types.rs
+++ b/src/test/run-pass/spawn-types.rs
@@ -14,7 +14,7 @@
   Arnold.
  */
 
-use core::comm::*;
+use std::comm::*;
 
 type ctx = Chan<int>;
 
diff --git a/src/test/run-pass/spawn.rs b/src/test/run-pass/spawn.rs
index 9a5131ef230..fef00549fa7 100644
--- a/src/test/run-pass/spawn.rs
+++ b/src/test/run-pass/spawn.rs
@@ -10,7 +10,7 @@
 // except according to those terms.
 
 
-extern mod std;
+extern mod extra;
 
 
 pub fn main() {
diff --git a/src/test/run-pass/stat.rs b/src/test/run-pass/stat.rs
index 2e081f364e7..f9216135038 100644
--- a/src/test/run-pass/stat.rs
+++ b/src/test/run-pass/stat.rs
@@ -10,9 +10,9 @@
 
 // xfail-fast
 
-extern mod std;
-use core::io::WriterUtil;
-use std::tempfile;
+extern mod extra;
+use std::io::WriterUtil;
+use extra::tempfile;
 
 pub fn main() {
     let dir = tempfile::mkdtemp(&Path("."), "").unwrap();
diff --git a/src/test/run-pass/str-append.rs b/src/test/run-pass/str-append.rs
index d8cc8716e11..4fdf7dde031 100644
--- a/src/test/run-pass/str-append.rs
+++ b/src/test/run-pass/str-append.rs
@@ -11,7 +11,7 @@
 
 
 // -*- rust -*-
-extern mod std;
+extern mod extra;
 
 fn test1() {
     let mut s: ~str = ~"hello";
diff --git a/src/test/run-pass/str-multiline.rs b/src/test/run-pass/str-multiline.rs
index 90a7583dec9..28c2cd7a41a 100644
--- a/src/test/run-pass/str-multiline.rs
+++ b/src/test/run-pass/str-multiline.rs
@@ -11,7 +11,7 @@
 
 
 // -*- rust -*-
-extern mod std;
+extern mod extra;
 
 pub fn main() {
     let a: ~str = ~"this \
diff --git a/src/test/run-pass/string-self-append.rs b/src/test/run-pass/string-self-append.rs
index 8c15a8c6892..6fe383a64a2 100644
--- a/src/test/run-pass/string-self-append.rs
+++ b/src/test/run-pass/string-self-append.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 pub fn main() {
     // Make sure we properly handle repeated self-appends.
diff --git a/src/test/run-pass/swap-1.rs b/src/test/run-pass/swap-1.rs
index ed69fa41d71..1c0c05cc16d 100644
--- a/src/test/run-pass/swap-1.rs
+++ b/src/test/run-pass/swap-1.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::util;
+use std::util;
 
 pub fn main() {
     let mut x = 3; let mut y = 7;
diff --git a/src/test/run-pass/swap-2.rs b/src/test/run-pass/swap-2.rs
index 738460def92..52092b994f9 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 core::util;
+use std::util;
 
 pub fn main() {
     let mut a: ~[int] = ~[0, 1, 2, 3, 4, 5, 6];
diff --git a/src/test/run-pass/swap-overlapping.rs b/src/test/run-pass/swap-overlapping.rs
index 05f943bf928..1f1b121d362 100644
--- a/src/test/run-pass/swap-overlapping.rs
+++ b/src/test/run-pass/swap-overlapping.rs
@@ -10,7 +10,7 @@
 
 // Issue #5041 - avoid overlapping memcpy when src and dest of a swap are the same
 
-use core::util;
+use std::util;
 
 pub fn main() {
     let mut test = TestDescAndFn {
diff --git a/src/test/run-pass/syntax-extension-fmt.rs b/src/test/run-pass/syntax-extension-fmt.rs
index 936c71dc0f3..67573fce2cd 100644
--- a/src/test/run-pass/syntax-extension-fmt.rs
+++ b/src/test/run-pass/syntax-extension-fmt.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 fn test(actual: ~str, expected: ~str) {
     debug!(actual.clone());
diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs
index bd5575f6154..90812f9a7f8 100644
--- a/src/test/run-pass/task-comm-0.rs
+++ b/src/test/run-pass/task-comm-0.rs
@@ -10,10 +10,10 @@
 
 // xfail-fast
 
-extern mod std;
+extern mod extra;
 
-use core::comm::Chan;
-use core::comm::Port;
+use std::comm::Chan;
+use std::comm::Port;
 
 pub fn main() { test05(); }
 
diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs
index fa3ead8dfe6..b4b9592329b 100644
--- a/src/test/run-pass/task-comm-10.rs
+++ b/src/test/run-pass/task-comm-10.rs
@@ -10,7 +10,7 @@
 
 // xfail-fast
 
-extern mod std;
+extern mod extra;
 
 fn start(c: &comm::Chan<comm::Chan<~str>>) {
     let (p, ch) = comm::stream();
diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs
index b2012fbd2dd..2c6baf91862 100644
--- a/src/test/run-pass/task-comm-11.rs
+++ b/src/test/run-pass/task-comm-11.rs
@@ -10,7 +10,7 @@
 
 // xfail-fast
 
-extern mod std;
+extern mod extra;
 
 fn start(c: &comm::Chan<comm::Chan<int>>) {
     let (p, ch) = comm::stream();
diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/run-pass/task-comm-12.rs
index 0f0b82d7c21..9ecbbaeaee2 100644
--- a/src/test/run-pass/task-comm-12.rs
+++ b/src/test/run-pass/task-comm-12.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 pub fn main() { test00(); }
 
diff --git a/src/test/run-pass/task-comm-13.rs b/src/test/run-pass/task-comm-13.rs
index f22328a3e1b..f10aa46ae6e 100644
--- a/src/test/run-pass/task-comm-13.rs
+++ b/src/test/run-pass/task-comm-13.rs
@@ -10,7 +10,7 @@
 
 // xfail-fast
 
-extern mod std;
+extern mod extra;
 
 fn start(c: &comm::Chan<int>, start: int, number_of_messages: int) {
     let mut i: int = 0;
diff --git a/src/test/run-pass/task-comm-15.rs b/src/test/run-pass/task-comm-15.rs
index 30862772062..3941f846666 100644
--- a/src/test/run-pass/task-comm-15.rs
+++ b/src/test/run-pass/task-comm-15.rs
@@ -11,7 +11,7 @@
 // xfail-fast
 // xfail-win32
 
-extern mod std;
+extern mod extra;
 
 fn start(c: &comm::Chan<int>, i0: int) {
     let mut i = i0;
diff --git a/src/test/run-pass/task-comm-17.rs b/src/test/run-pass/task-comm-17.rs
index 58fa65b7fe7..25bddc7fe94 100644
--- a/src/test/run-pass/task-comm-17.rs
+++ b/src/test/run-pass/task-comm-17.rs
@@ -12,7 +12,7 @@
 
 // This test is specifically about spawning temporary closures.
 
-extern mod std;
+extern mod extra;
 
 fn f() {
 }
diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs
index 1a3dc678d42..faa1d8a69b1 100644
--- a/src/test/run-pass/task-comm-3.rs
+++ b/src/test/run-pass/task-comm-3.rs
@@ -10,8 +10,8 @@
 
 // xfail-fast
 
-extern mod std;
-use core::comm::Chan;
+extern mod extra;
+use std::comm::Chan;
 
 pub fn main() { debug!("===== WITHOUT THREADS ====="); test00(); }
 
diff --git a/src/test/run-pass/task-comm-5.rs b/src/test/run-pass/task-comm-5.rs
index b6a517a6f81..22ca343ff17 100644
--- a/src/test/run-pass/task-comm-5.rs
+++ b/src/test/run-pass/task-comm-5.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 pub fn main() { test00(); }
 
diff --git a/src/test/run-pass/task-comm-6.rs b/src/test/run-pass/task-comm-6.rs
index 38fdc2dc33e..16d6f53ad86 100644
--- a/src/test/run-pass/task-comm-6.rs
+++ b/src/test/run-pass/task-comm-6.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::comm::Chan;
+use std::comm::Chan;
 
 pub fn main() { test00(); }
 
diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/run-pass/task-comm-7.rs
index 227f8aadecd..3cc1127fbbf 100644
--- a/src/test/run-pass/task-comm-7.rs
+++ b/src/test/run-pass/task-comm-7.rs
@@ -10,7 +10,7 @@
 
 // xfail-fast
 
-extern mod std;
+extern mod extra;
 
 pub fn main() { test00(); }
 
diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs
index f1337736965..41e91097d27 100644
--- a/src/test/run-pass/task-comm-9.rs
+++ b/src/test/run-pass/task-comm-9.rs
@@ -10,7 +10,7 @@
 
 // xfail-fast
 
-extern mod std;
+extern mod extra;
 
 pub fn main() { test00(); }
 
diff --git a/src/test/run-pass/task-comm-chan-nil.rs b/src/test/run-pass/task-comm-chan-nil.rs
index ec534a66500..64b587eff9a 100644
--- a/src/test/run-pass/task-comm-chan-nil.rs
+++ b/src/test/run-pass/task-comm-chan-nil.rs
@@ -10,7 +10,7 @@
 // except according to those terms.
 
 
-extern mod std;
+extern mod extra;
 
 // rustboot can't transmit nils across channels because they don't have
 // any size, but rustc currently can because they do have size. Whether
diff --git a/src/test/run-pass/task-killjoin-rsrc.rs b/src/test/run-pass/task-killjoin-rsrc.rs
index 879f668577f..4b89ddc4a6c 100644
--- a/src/test/run-pass/task-killjoin-rsrc.rs
+++ b/src/test/run-pass/task-killjoin-rsrc.rs
@@ -13,8 +13,8 @@
 // A port of task-killjoin to use a class with a dtor to manage
 // the join.
 
-use core::cell::Cell;
-use core::comm::*;
+use std::cell::Cell;
+use std::comm::*;
 
 struct notify {
     ch: Chan<bool>, v: @mut bool,
diff --git a/src/test/run-pass/task-life-0.rs b/src/test/run-pass/task-life-0.rs
index 9885c5d6f3f..0ec62ff8541 100644
--- a/src/test/run-pass/task-life-0.rs
+++ b/src/test/run-pass/task-life-0.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 pub fn main() {
     task::spawn(|| child(~"Hello") );
 }
diff --git a/src/test/run-pass/task-spawn-move-and-copy.rs b/src/test/run-pass/task-spawn-move-and-copy.rs
index f67cc0d51af..3e17c5d992c 100644
--- a/src/test/run-pass/task-spawn-move-and-copy.rs
+++ b/src/test/run-pass/task-spawn-move-and-copy.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 main() {
     let (p, ch) = stream::<uint>();
diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/run-pass/terminate-in-initializer.rs
index cb169c3a638..0e1bf1e9062 100644
--- a/src/test/run-pass/terminate-in-initializer.rs
+++ b/src/test/run-pass/terminate-in-initializer.rs
@@ -12,7 +12,7 @@
 // Issue #787
 // Don't try to clean up uninitialized locals
 
-extern mod std;
+extern mod extra;
 
 fn test_break() { loop { let x: @int = break; } }
 
diff --git a/src/test/run-pass/test-ignore-cfg.rs b/src/test/run-pass/test-ignore-cfg.rs
index 304c9e5ccb9..536dd78bba1 100644
--- a/src/test/run-pass/test-ignore-cfg.rs
+++ b/src/test/run-pass/test-ignore-cfg.rs
@@ -11,7 +11,7 @@
 // compile-flags: --test --cfg ignorecfg
 // xfail-fast
 
-extern mod std;
+extern mod extra;
 
 #[test]
 #[ignore(cfg(ignorecfg))]
diff --git a/src/test/run-pass/test-runner-hides-main.rs b/src/test/run-pass/test-runner-hides-main.rs
index 74b63e4dd27..3f1e9fe4c51 100644
--- a/src/test/run-pass/test-runner-hides-main.rs
+++ b/src/test/run-pass/test-runner-hides-main.rs
@@ -11,7 +11,7 @@
 // compile-flags:--test
 // xfail-fast
 
-extern mod std;
+extern mod extra;
 
 // Building as a test runner means that a synthetic main will be run,
 // not ours
diff --git a/src/test/run-pass/threads.rs b/src/test/run-pass/threads.rs
index a72d3dd40f4..47b49513a60 100644
--- a/src/test/run-pass/threads.rs
+++ b/src/test/run-pass/threads.rs
@@ -10,7 +10,7 @@
 // except according to those terms.
 
 
-extern mod std;
+extern mod extra;
 
 pub fn main() {
     let mut i = 10;
diff --git a/src/test/run-pass/trait-inheritance-num.rs b/src/test/run-pass/trait-inheritance-num.rs
index 9135b458f95..87de3a2be14 100644
--- a/src/test/run-pass/trait-inheritance-num.rs
+++ b/src/test/run-pass/trait-inheritance-num.rs
@@ -10,10 +10,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
-use core::cmp::{Eq, Ord};
-use core::num::NumCast;
+use std::cmp::{Eq, Ord};
+use std::num::NumCast;
 
 pub trait NumExt: Num + NumCast + Eq + Ord {}
 
diff --git a/src/test/run-pass/trait-inheritance-num0.rs b/src/test/run-pass/trait-inheritance-num0.rs
index 3e31b8067f9..ae285f3bc95 100644
--- a/src/test/run-pass/trait-inheritance-num0.rs
+++ b/src/test/run-pass/trait-inheritance-num0.rs
@@ -12,7 +12,7 @@
 
 // Extending Num and using inherited static methods
 
-use core::num::NumCast;
+use std::num::NumCast;
 
 trait Num {
     fn from_int(i: int) -> Self;
diff --git a/src/test/run-pass/trait-inheritance-num1.rs b/src/test/run-pass/trait-inheritance-num1.rs
index 25741518f66..d22a8154a5b 100644
--- a/src/test/run-pass/trait-inheritance-num1.rs
+++ b/src/test/run-pass/trait-inheritance-num1.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cmp::Ord;
-use core::num::NumCast;
+use std::cmp::Ord;
+use std::num::NumCast;
 
 pub trait NumExt: Num + NumCast + Ord { }
 
diff --git a/src/test/run-pass/trait-inheritance-num2.rs b/src/test/run-pass/trait-inheritance-num2.rs
index 2963a815e05..ff9c792af29 100644
--- a/src/test/run-pass/trait-inheritance-num2.rs
+++ b/src/test/run-pass/trait-inheritance-num2.rs
@@ -12,9 +12,9 @@
 
 // A more complex example of numeric extensions
 
-extern mod std;
+extern mod extra;
 
-use core::cmp::{Eq, Ord};
+use std::cmp::{Eq, Ord};
 
 pub trait TypeExt {}
 
diff --git a/src/test/run-pass/trait-inheritance-num3.rs b/src/test/run-pass/trait-inheritance-num3.rs
index 667fd335ac4..98fa6a5ebf1 100644
--- a/src/test/run-pass/trait-inheritance-num3.rs
+++ b/src/test/run-pass/trait-inheritance-num3.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cmp::{Eq, Ord};
-use core::num::NumCast;
+use std::cmp::{Eq, Ord};
+use std::num::NumCast;
 
 pub trait NumExt: Eq + Ord + Num + NumCast {}
 
diff --git a/src/test/run-pass/trait-inheritance-num5.rs b/src/test/run-pass/trait-inheritance-num5.rs
index f1897636c8a..f56eca693ea 100644
--- a/src/test/run-pass/trait-inheritance-num5.rs
+++ b/src/test/run-pass/trait-inheritance-num5.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cmp::{Eq, Ord};
-use core::num::NumCast;
+use std::cmp::{Eq, Ord};
+use std::num::NumCast;
 
 pub trait NumExt: Eq + Num + NumCast {}
 
diff --git a/src/test/run-pass/trait-inheritance-overloading-simple.rs b/src/test/run-pass/trait-inheritance-overloading-simple.rs
index 2e9b60303c6..041452176e0 100644
--- a/src/test/run-pass/trait-inheritance-overloading-simple.rs
+++ b/src/test/run-pass/trait-inheritance-overloading-simple.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;
 
 trait MyNum : Eq { }
 
diff --git a/src/test/run-pass/trait-inheritance-overloading.rs b/src/test/run-pass/trait-inheritance-overloading.rs
index 82c9091147d..302d3d87df9 100644
--- a/src/test/run-pass/trait-inheritance-overloading.rs
+++ b/src/test/run-pass/trait-inheritance-overloading.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;
 
 trait MyNum : Add<Self,Self> + Sub<Self,Self> + Mul<Self,Self> + Eq { }
 
diff --git a/src/test/run-pass/trait-to-str.rs b/src/test/run-pass/trait-to-str.rs
index 9726eed5804..ff01efc027e 100644
--- a/src/test/run-pass/trait-to-str.rs
+++ b/src/test/run-pass/trait-to-str.rs
@@ -12,9 +12,9 @@
 
 #[no_std];
 
-extern mod core;
+extern mod std;
 
-use core::{str, int, vec};
+use std::{str, int, vec};
 
 trait to_str {
     fn to_str(&self) -> ~str;
diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs
index adb3ae9557b..5695254cdbf 100644
--- a/src/test/run-pass/type-sizes.rs
+++ b/src/test/run-pass/type-sizes.rs
@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod core;
-use core::sys::size_of;
+extern mod std;
+use std::sys::size_of;
 
 struct t {a: u8, b: i8}
 struct u {a: u8, b: i8, c: u8}
diff --git a/src/test/run-pass/unify-return-ty.rs b/src/test/run-pass/unify-return-ty.rs
index 820d42ab14d..2f686d21b96 100644
--- a/src/test/run-pass/unify-return-ty.rs
+++ b/src/test/run-pass/unify-return-ty.rs
@@ -11,7 +11,7 @@
 // Tests that the tail expr in null() has its type
 // unified with the type *T, and so the type variable
 // in that type gets resolved.
-extern mod std;
+extern mod extra;
 
 fn null<T>() -> *T {
     unsafe {
diff --git a/src/test/run-pass/unique-kinds.rs b/src/test/run-pass/unique-kinds.rs
index dbbd238cbac..b3ce71dcbff 100644
--- a/src/test/run-pass/unique-kinds.rs
+++ b/src/test/run-pass/unique-kinds.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;
 
 fn sendable() {
 
diff --git a/src/test/run-pass/unique-send-2.rs b/src/test/run-pass/unique-send-2.rs
index 9b522490f98..3684a6ef788 100644
--- a/src/test/run-pass/unique-send-2.rs
+++ b/src/test/run-pass/unique-send-2.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::*;
 
 fn child(c: &SharedChan<~uint>, i: uint) {
     c.send(~i);
diff --git a/src/test/run-pass/unique-send.rs b/src/test/run-pass/unique-send.rs
index a611992d7ee..05012f789c3 100644
--- a/src/test/run-pass/unique-send.rs
+++ b/src/test/run-pass/unique-send.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 main() {
     let (p, c) = stream();
diff --git a/src/test/run-pass/unique-swap.rs b/src/test/run-pass/unique-swap.rs
index fa3aeb5d421..a372e4a4d98 100644
--- a/src/test/run-pass/unique-swap.rs
+++ b/src/test/run-pass/unique-swap.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::util;
+use std::util;
 
 pub fn main() {
     let mut i = ~100;
diff --git a/src/test/run-pass/unwind-box.rs b/src/test/run-pass/unwind-box.rs
index 90e8d41d26a..5184ffb8d23 100644
--- a/src/test/run-pass/unwind-box.rs
+++ b/src/test/run-pass/unwind-box.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-extern mod std;
+extern mod extra;
 
 fn f() {
     let a = @0;
diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/run-pass/unwind-resource.rs
index 4c7b2e63702..012b12ea99e 100644
--- a/src/test/run-pass/unwind-resource.rs
+++ b/src/test/run-pass/unwind-resource.rs
@@ -9,9 +9,9 @@
 // except according to those terms.
 
 // xfail-win32
-extern mod std;
+extern mod extra;
 
-use core::comm::*;
+use std::comm::*;
 
 struct complainer {
   c: SharedChan<bool>,
diff --git a/src/test/run-pass/unwind-resource2.rs b/src/test/run-pass/unwind-resource2.rs
index 993acc2264f..0d7c717cd36 100644
--- a/src/test/run-pass/unwind-resource2.rs
+++ b/src/test/run-pass/unwind-resource2.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-extern mod std;
+extern mod extra;
 
 struct complainer {
   c: @int,
diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/run-pass/unwind-unique.rs
index 8b0850cff77..f5f5209fa54 100644
--- a/src/test/run-pass/unwind-unique.rs
+++ b/src/test/run-pass/unwind-unique.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // xfail-win32
-extern mod std;
+extern mod extra;
 
 fn f() {
     let a = ~0;
diff --git a/src/test/run-pass/use-crate-name-alias.rs b/src/test/run-pass/use-crate-name-alias.rs
index ea9dcc2f562..4954de3919f 100644
--- a/src/test/run-pass/use-crate-name-alias.rs
+++ b/src/test/run-pass/use-crate-name-alias.rs
@@ -9,6 +9,6 @@
 // except according to those terms.
 
 // Issue #1706
-extern mod stdlib(name="std");
+extern mod stdlib(name="extra");
 
 pub fn main() {}
diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs
index 11f9e7641e1..d73eb6641fa 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/run-pass/use.rs
@@ -11,16 +11,16 @@
 // except according to those terms.
 
 #[no_std];
-extern mod core;
-extern mod zed(name = "core");
-extern mod bar(name = "core", vers = "0.7-pre");
+extern mod std;
+extern mod zed(name = "std");
+extern mod bar(name = "std", vers = "0.7-pre");
 
 
-use core::str;
+use std::str;
 use x = zed::str;
 mod baz {
     pub use bar::str;
-    pub use x = core::str;
+    pub use x = std::str;
 }
 
 pub fn main() { }
diff --git a/src/test/run-pass/utf8_chars.rs b/src/test/run-pass/utf8_chars.rs
index fd98723c2f6..23dddf59925 100644
--- a/src/test/run-pass/utf8_chars.rs
+++ b/src/test/run-pass/utf8_chars.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 pub fn main() {
     // Chars of 1, 2, 3, and 4 bytes
diff --git a/src/test/run-pass/vec-matching-autoslice.rs b/src/test/run-pass/vec-matching-autoslice.rs
index 6757ef46951..d04deeac52e 100644
--- a/src/test/run-pass/vec-matching-autoslice.rs
+++ b/src/test/run-pass/vec-matching-autoslice.rs
@@ -1,22 +1,22 @@
 pub fn main() {
     let x = @[1, 2, 3];
     match x {
-        [2, .._] => ::core::util::unreachable(),
+        [2, .._] => ::std::util::unreachable(),
         [1, ..tail] => {
             assert_eq!(tail, [2, 3]);
         }
-        [_] => ::core::util::unreachable(),
-        [] => ::core::util::unreachable()
+        [_] => ::std::util::unreachable(),
+        [] => ::std::util::unreachable()
     }
 
     let y = (~[(1, true), (2, false)], 0.5);
     match y {
-        ([_, _, _], 0.5) => ::core::util::unreachable(),
+        ([_, _, _], 0.5) => ::std::util::unreachable(),
         ([(1, a), (b, false), ..tail], _) => {
             assert_eq!(a, true);
             assert_eq!(b, 2);
             assert!(tail.is_empty());
         }
-        ([..tail], _) => ::core::util::unreachable()
+        ([..tail], _) => ::std::util::unreachable()
     }
 }
diff --git a/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs b/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs
index 561d5555f12..acd9a9664f7 100644
--- a/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs
+++ b/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs
@@ -3,7 +3,7 @@ pub fn main() {
     if !x.is_empty() {
         let el = match x {
             [1, ..ref tail] => &tail[0],
-            _ => ::core::util::unreachable()
+            _ => ::std::util::unreachable()
         };
         io::println(fmt!("%d", *el));
     }
diff --git a/src/test/run-pass/vec-matching.rs b/src/test/run-pass/vec-matching.rs
index e4ca51368b2..5e906fa2659 100644
--- a/src/test/run-pass/vec-matching.rs
+++ b/src/test/run-pass/vec-matching.rs
@@ -1,14 +1,14 @@
 fn a() {
     let x = [1];
     match x {
-        [_, _, _, _, _, .._] => ::core::util::unreachable(),
-        [.._, _, _, _, _] => ::core::util::unreachable(),
-        [_, .._, _, _] => ::core::util::unreachable(),
-        [_, _] => ::core::util::unreachable(),
+        [_, _, _, _, _, .._] => ::std::util::unreachable(),
+        [.._, _, _, _, _] => ::std::util::unreachable(),
+        [_, .._, _, _] => ::std::util::unreachable(),
+        [_, _] => ::std::util::unreachable(),
         [a] => {
             assert_eq!(a, 1);
         }
-        [] => ::core::util::unreachable()
+        [] => ::std::util::unreachable()
     }
 }
 
diff --git a/src/test/run-pass/vec-self-append.rs b/src/test/run-pass/vec-self-append.rs
index 30f6befe69c..ef661c7ed67 100644
--- a/src/test/run-pass/vec-self-append.rs
+++ b/src/test/run-pass/vec-self-append.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 fn test_heap_to_heap() {
     // a spills onto the heap
diff --git a/src/test/run-pass/vec-tail-matching.rs b/src/test/run-pass/vec-tail-matching.rs
index 6a98ed678b2..cf4aebbd082 100644
--- a/src/test/run-pass/vec-tail-matching.rs
+++ b/src/test/run-pass/vec-tail-matching.rs
@@ -17,19 +17,19 @@ pub fn main() {
 
             match tail {
                 [Foo { _ }, _, Foo { _ }, ..tail] => {
-                    ::core::util::unreachable();
+                    ::std::util::unreachable();
                 }
                 [Foo { string: a }, Foo { string: b }] => {
                     assert_eq!(a, ~"bar");
                     assert_eq!(b, ~"baz");
                 }
                 _ => {
-                    ::core::util::unreachable();
+                    ::std::util::unreachable();
                 }
             }
         }
         _ => {
-            ::core::util::unreachable();
+            ::std::util::unreachable();
         }
     }
 }
diff --git a/src/test/run-pass/weird-exprs.rs b/src/test/run-pass/weird-exprs.rs
index f226f315ff9..5a585c8c10e 100644
--- a/src/test/run-pass/weird-exprs.rs
+++ b/src/test/run-pass/weird-exprs.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::util;
+use std::util;
 
 // Just a grab bag of stuff that you wouldn't want to actually write.
author	Patrick Walton <pcwalton@mimiga.net>	2013-05-20 17:07:24 -0700
committer	Patrick Walton <pcwalton@mimiga.net>	2013-05-22 21:57:10 -0700
commit	1be40be613177d4849f42da284a3af74e1d58da2 (patch)
tree	e0e9563c7648966ed6d0a620d7829d52ea3fa9f0
parent	c10e0cb9c984ece484a5c8c9c4c20369e2be499b (diff)
download	rust-1be40be613177d4849f42da284a3af74e1d58da2.tar.gz rust-1be40be613177d4849f42da284a3af74e1d58da2.zip