Copy first batch of material from libstd to libcore.

6 files changed, 28 insertions, 27 deletions

diff --git a/src/compiletest/common.rs b/src/compiletest/common.rs
index ab0415fd7c1..0555fabbcdc 100644
--- a/src/compiletest/common.rs
+++ b/src/compiletest/common.rs
@@ -1,4 +1,4 @@
-import std::option;
+import option;
 
 tag mode { mode_compile_fail; mode_run_fail; mode_run_pass; mode_pretty; }
 
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 1c3dd5e00b5..f85edd83782 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -1,18 +1,18 @@
 // FIXME: The way this module sets up tests is a relic and more convoluted
 // than it needs to be
 
-import std::option;
+import option;
 import std::getopts;
 import std::test;
 import std::fs;
-import std::str;
-import std::vec;
-import std::task;
-
-import std::comm::port;
-import std::comm::chan;
-import std::comm::send;
-import std::comm::recv;
+import str;
+import vec;
+import task;
+
+import comm::port;
+import comm::chan;
+import comm::send;
+import comm::recv;
 
 import common::cx;
 import common::config;
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs
index 93fbdd3dead..abc72c2bce2 100644
--- a/src/compiletest/header.rs
+++ b/src/compiletest/header.rs
@@ -1,5 +1,5 @@
-import std::option;
-import std::str;
+import option;
+import str;
 import std::io;
 import std::fs;
 
@@ -63,7 +63,7 @@ fn is_test_ignored(config: config, testfile: str) -> bool {
 }
 
 fn iter_header(testfile: str, it: block(str)) {
-    let rdr = std::result::get(io::file_reader(testfile));
+    let rdr = result::get(io::file_reader(testfile));
     while !rdr.eof() {
         let ln = rdr.read_line();
 
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index 6bc35ea171c..17f2c739062 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -4,20 +4,21 @@
 // child process. Because of that we have to use a complicated scheme with a
 // dedicated server for spawning processes.
 
-import std::option;
-import std::task;
+import core::comm;
+import core::option;
+import task;
 import std::generic_os::setenv;
 import std::generic_os::getenv;
-import std::vec;
+import vec;
 import std::os;
 import std::run;
 import std::io;
-import std::str;
-import std::comm::chan;
-import std::comm::port;
-import std::comm::send;
-import std::comm::recv;
-import std::ctypes::{pid_t, fd_t};
+import str;
+import comm::chan;
+import comm::port;
+import comm::send;
+import comm::recv;
+import ctypes::{pid_t, fd_t};
 
 export handle;
 export mk;
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 59b14385b86..199b4823248 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -1,10 +1,10 @@
 import std::io;
-import std::str;
-import std::option;
+import str;
+import option;
 import std::fs;
 import std::os;
-import std::vec;
-import std::result;
+import vec;
+import result;
 
 import common::mode_run_pass;
 import common::mode_run_fail;
diff --git a/src/compiletest/util.rs b/src/compiletest/util.rs
index a5e79746382..bc830048979 100644
--- a/src/compiletest/util.rs
+++ b/src/compiletest/util.rs
@@ -1,4 +1,4 @@
-import std::option;
+import option;
 import std::generic_os::getenv;
 import std::io;