libextra: Rename the actual metadata names of libcore to libstd and libstd to libextra

7 files changed, 16 insertions, 2 deletions

diff --git a/src/compiletest/common.rs b/src/compiletest/common.rs
index 38289f62741..869657326b7 100644
--- a/src/compiletest/common.rs
+++ b/src/compiletest/common.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 #[deriving(Eq)]
 pub enum mode {
     mode_compile_fail,
diff --git a/src/compiletest/compiletest.rc b/src/compiletest/compiletest.rc
index 5d703f67213..f9ad0d5f925 100644
--- a/src/compiletest/compiletest.rc
+++ b/src/compiletest/compiletest.rc
@@ -12,10 +12,13 @@
 
 #[allow(non_camel_case_types)];
 
-extern mod std;
+#[no_std];
 
-use core::*;
+extern mod core(name = "std", vers = "0.7-pre");
+extern mod std(name = "extra", vers = "0.7-pre");
 
+use core::prelude::*;
+use core::*;
 
 use std::getopts;
 use std::test;
diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs
index aa8d61027b3..297ec9ee21e 100644
--- a/src/compiletest/errors.rs
+++ b/src/compiletest/errors.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }
 
 // Load any test directives embedded in the file
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs
index b1f4c9f515b..b3205a48610 100644
--- a/src/compiletest/header.rs
+++ b/src/compiletest/header.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use common;
 use common::config;
 
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index 71efa5596a8..2a4cd08c124 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
 
 use core::libc::c_int;
 use core::run::spawn_process;
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index d58c2e596bd..da81df0e404 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use common::mode_run_pass;
 use common::mode_run_fail;
 use common::mode_compile_fail;
diff --git a/src/compiletest/util.rs b/src/compiletest/util.rs
index 05e5d902a47..e9b09e8aee8 100644
--- a/src/compiletest/util.rs
+++ b/src/compiletest/util.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use common::config;
 
 use core::os::getenv;