Copy first batch of material from libstd to libcore.

42 files changed, 146 insertions, 76 deletions

diff --git a/src/test/stdtest/bitv.rs b/src/test/stdtest/bitv.rs
index 348ee3955dc..ffd3ec232fa 100644
--- a/src/test/stdtest/bitv.rs
+++ b/src/test/stdtest/bitv.rs
@@ -1,6 +1,7 @@
+import core::*;
 
 use std;
-import std::vec;
+import vec;
 import std::bitv;
 
 #[test]
diff --git a/src/test/stdtest/bool.rs b/src/test/stdtest/bool.rs
index 2f91b7aa1e1..528e8e42681 100644
--- a/src/test/stdtest/bool.rs
+++ b/src/test/stdtest/bool.rs
@@ -1,6 +1,8 @@
+import core::*;
+
 use std;
 
-import std::bool;
+import bool;
 
 #[test]
 fn test_bool_from_str() {
diff --git a/src/test/stdtest/box.rs b/src/test/stdtest/box.rs
index c28cb520be8..abe80eec997 100644
--- a/src/test/stdtest/box.rs
+++ b/src/test/stdtest/box.rs
@@ -1,6 +1,7 @@
+import core::*;
 
 use std;
-import std::box;
+import box;
 
 #[test]
 fn test() {
diff --git a/src/test/stdtest/c_vec.rs b/src/test/stdtest/c_vec.rs
index 8ac81274fc7..d196a7baa3b 100644
--- a/src/test/stdtest/c_vec.rs
+++ b/src/test/stdtest/c_vec.rs
@@ -1,7 +1,9 @@
+import core::*;
+
 // -*- rust -*-
 use std;
 import std::c_vec::*;
-import std::ctypes::*;
+import ctypes::*;
 
 #[link_name = ""]
 #[abi = "cdecl"]
diff --git a/src/test/stdtest/char.rs b/src/test/stdtest/char.rs
index ac567d23341..a02abcb5676 100644
--- a/src/test/stdtest/char.rs
+++ b/src/test/stdtest/char.rs
@@ -1,5 +1,7 @@
+import core::*;
+
 use std;
-import std::char;
+import char;
 
 #[test]
 fn test_is_whitespace() {
diff --git a/src/test/stdtest/comm.rs b/src/test/stdtest/comm.rs
index bef5a3c4e5b..fbb0cec73c9 100644
--- a/src/test/stdtest/comm.rs
+++ b/src/test/stdtest/comm.rs
@@ -1,5 +1,7 @@
+import core::*;
+
 use std;
-import std::comm;
+import comm;
 
 #[test]
 fn create_port_and_chan() { let p = comm::port::<int>(); comm::chan(p); }
diff --git a/src/test/stdtest/deque.rs b/src/test/stdtest/deque.rs
index 7a488475b9d..70b2c99f571 100644
--- a/src/test/stdtest/deque.rs
+++ b/src/test/stdtest/deque.rs
@@ -1,4 +1,4 @@
-
+import core::*;
 
 // -*- rust -*-
 use std;
diff --git a/src/test/stdtest/either.rs b/src/test/stdtest/either.rs
index f79db3088b1..de5849f029f 100644
--- a/src/test/stdtest/either.rs
+++ b/src/test/stdtest/either.rs
@@ -1,6 +1,9 @@
+import core::*;
+
 use std;
-import std::either::*;
-import std::vec::len;
+import vec;
+import core::either::*;
+import vec::len;
 
 #[test]
 fn test_either_left() {
diff --git a/src/test/stdtest/float.rs b/src/test/stdtest/float.rs
index 8720e455586..36f5dc167b1 100644
--- a/src/test/stdtest/float.rs
+++ b/src/test/stdtest/float.rs
@@ -1,5 +1,7 @@
+import core::*;
+
 use std;
-import std::float;
+import float;
 
 #[test]
 fn test_from_str() {
diff --git a/src/test/stdtest/four.rs b/src/test/stdtest/four.rs
index d0af7a393d3..25f1abc4cea 100644
--- a/src/test/stdtest/four.rs
+++ b/src/test/stdtest/four.rs
@@ -1,3 +1,5 @@
+import core::*;
+
 use std;
 
 import std::tri;
diff --git a/src/test/stdtest/fs.rs b/src/test/stdtest/fs.rs
index 66cec07c795..a57cebc332d 100644
--- a/src/test/stdtest/fs.rs
+++ b/src/test/stdtest/fs.rs
@@ -1,6 +1,8 @@
+import core::*;
 
 use std;
 import std::fs;
+import vec;
 
 #[test]
 fn test_connect() {
@@ -18,7 +20,7 @@ fn test_list_dir_no_invalid_memory_access() { fs::list_dir("."); }
 fn list_dir() {
     let dirs = fs::list_dir(".");
     // Just assuming that we've got some contents in the current directory
-    assert (std::vec::len(dirs) > 0u);
+    assert (vec::len(dirs) > 0u);
 
     for dir in dirs { log dir; }
 }
diff --git a/src/test/stdtest/getopts.rs b/src/test/stdtest/getopts.rs
index 781abf48405..3730a17e181 100644
--- a/src/test/stdtest/getopts.rs
+++ b/src/test/stdtest/getopts.rs
@@ -1,3 +1,4 @@
+import core::*;
 
 use std;
 import opt = std::getopts;
diff --git a/src/test/stdtest/int.rs b/src/test/stdtest/int.rs
index 43bdf39ee00..c8ec806189f 100644
--- a/src/test/stdtest/int.rs
+++ b/src/test/stdtest/int.rs
@@ -1,8 +1,10 @@
+import core::*;
 
 use std;
-import std::int;
-import std::str::eq;
-import std::str::bytes;
+import str;
+import int;
+import str::eq;
+import str::bytes;
 
 #[test]
 fn test_from_str() {
diff --git a/src/test/stdtest/io.rs b/src/test/stdtest/io.rs
index dcb6559dc7a..1c9774b7fe6 100644
--- a/src/test/stdtest/io.rs
+++ b/src/test/stdtest/io.rs
@@ -1,8 +1,10 @@
+import core::*;
+
 // -*- rust -*-
 use std;
 import std::io;
-import std::str;
-import std::result;
+import str;
+import result;
 
 #[test]
 fn test_simple() {
diff --git a/src/test/stdtest/json.rs b/src/test/stdtest/json.rs
index a19ddec5e7d..db65b223ff7 100644
--- a/src/test/stdtest/json.rs
+++ b/src/test/stdtest/json.rs
@@ -1,6 +1,9 @@
+import core::*;
+
 use std;
+import option;
 import std::json::*;
-import std::option::{none, some};
+import option::{none, some};
 
 #[test]
 fn test_from_str_num() {
diff --git a/src/test/stdtest/list.rs b/src/test/stdtest/list.rs
index 453ed7fc9ba..da1643e9274 100644
--- a/src/test/stdtest/list.rs
+++ b/src/test/stdtest/list.rs
@@ -1,10 +1,11 @@
+import core::*;
 
 use std;
 import std::list;
 import std::list::head;
 import std::list::tail;
 import std::list::from_vec;
-import std::option;
+import option;
 
 #[test]
 fn test_from_vec() {
diff --git a/src/test/stdtest/map.rs b/src/test/stdtest/map.rs
index 40149b1407f..b7e62a6b0d2 100644
--- a/src/test/stdtest/map.rs
+++ b/src/test/stdtest/map.rs
@@ -1,11 +1,11 @@
-
+import core::*;
 
 // -*- rust -*-
 use std;
 import std::map;
-import std::str;
-import std::uint;
-import std::option;
+import str;
+import uint;
+import option;
 
 
 #[test]
@@ -257,7 +257,7 @@ fn test_contains_key() {
 fn test_find() {
     let key = "k";
     let map = map::mk_hashmap::<str, str>(str::hash, str::eq);
-    assert (std::option::is_none(map.find(key)));
+    assert (option::is_none(map.find(key)));
     map.insert(key, "val");
-    assert (std::option::get(map.find(key)) == "val");
+    assert (option::get(map.find(key)) == "val");
 }
diff --git a/src/test/stdtest/math.rs b/src/test/stdtest/math.rs
index 0b319888dcd..bff63340cf5 100644
--- a/src/test/stdtest/math.rs
+++ b/src/test/stdtest/math.rs
@@ -1,8 +1,10 @@
+import core::*;
+
 use std;
 
 import std::math::*;
-import std::float;
-import c_int = std::ctypes::c_int;
+import float;
+import c_int = ctypes::c_int;
 
 #[test]
 fn test_max_min() {
diff --git a/src/test/stdtest/net.rs b/src/test/stdtest/net.rs
index 9da7a12a060..c0872db3fc7 100644
--- a/src/test/stdtest/net.rs
+++ b/src/test/stdtest/net.rs
@@ -1,3 +1,5 @@
+import core::*;
+
 use std;
 import std::net;
 
diff --git a/src/test/stdtest/option.rs b/src/test/stdtest/option.rs
index 0cca3a65a4f..a04751da101 100644
--- a/src/test/stdtest/option.rs
+++ b/src/test/stdtest/option.rs
@@ -1,5 +1,6 @@
+import core::*;
 
 use std;
 
 #[test]
-fn test() { let _x = std::option::some::<int>(10); }
+fn test() { let _x = option::some::<int>(10); }
diff --git a/src/test/stdtest/os.rs b/src/test/stdtest/os.rs
index 8f7b5f5dc23..1236a790925 100644
--- a/src/test/stdtest/os.rs
+++ b/src/test/stdtest/os.rs
@@ -1,6 +1,8 @@
+import core::*;
+
 import std::generic_os::setenv;
 import std::generic_os::getenv;
-import std::option;
+import option;
 
 #[test]
 #[ignore(reason = "fails periodically on mac")]
@@ -38,7 +40,7 @@ fn get_exe_path() {
 
     // Hard to test this function
     if std::os::target_os() != "win32" {
-        assert std::str::starts_with(path, std::fs::path_sep());
+        assert str::starts_with(path, std::fs::path_sep());
     } else {
         assert path[1] == ':' as u8;
     }
diff --git a/src/test/stdtest/path.rs b/src/test/stdtest/path.rs
index 911bc6b0dd9..911b1fa6404 100644
--- a/src/test/stdtest/path.rs
+++ b/src/test/stdtest/path.rs
@@ -1,3 +1,4 @@
+import core::*;
 
 // Testing a few of the path manipuation functions
 
diff --git a/src/test/stdtest/ptr.rs b/src/test/stdtest/ptr.rs
index 6a353bcdeea..a2242b1a06d 100644
--- a/src/test/stdtest/ptr.rs
+++ b/src/test/stdtest/ptr.rs
@@ -1,6 +1,8 @@
+import core::*;
+
 use std;
-import std::ptr;
-import std::unsafe;
+import ptr;
+import unsafe;
 
 type pair = {mutable fst: int, mutable snd: int};
 
diff --git a/src/test/stdtest/qsort.rs b/src/test/stdtest/qsort.rs
index cb0433ca02b..123fb39d25e 100644
--- a/src/test/stdtest/qsort.rs
+++ b/src/test/stdtest/qsort.rs
@@ -1,12 +1,13 @@
+import core::*;
 
 use std;
 
 import std::sort;
-import std::vec;
-import std::int;
+import vec;
+import int;
 
 fn check_sort(v1: [mutable int], v2: [mutable int]) {
-    let len = std::vec::len::<int>(v1);
+    let len = vec::len::<int>(v1);
     fn ltequal(&&a: int, &&b: int) -> bool { ret a <= b; }
     let f = ltequal;
     std::sort::quick_sort::<int>(f, v1);
diff --git a/src/test/stdtest/qsort3.rs b/src/test/stdtest/qsort3.rs
index 1a4f080369b..0b178a00591 100644
--- a/src/test/stdtest/qsort3.rs
+++ b/src/test/stdtest/qsort3.rs
@@ -1,8 +1,9 @@
+import core::*;
 
 use std;
 
 fn check_sort(v1: [mutable int], v2: [mutable int]) {
-    let len = std::vec::len::<int>(v1);
+    let len = vec::len::<int>(v1);
     fn lt(&&a: int, &&b: int) -> bool { ret a < b; }
     fn equal(&&a: int, &&b: int) -> bool { ret a == b; }
     let f1 = lt;
diff --git a/src/test/stdtest/rand.rs b/src/test/stdtest/rand.rs
index b0d71d0e431..2ee04719776 100644
--- a/src/test/stdtest/rand.rs
+++ b/src/test/stdtest/rand.rs
@@ -1,9 +1,9 @@
-
+import core::*;
 
 // -*- rust -*-
 use std;
 import std::rand;
-import std::str;
+import str;
 
 #[test]
 fn test() {
diff --git a/src/test/stdtest/result.rs b/src/test/stdtest/result.rs
index 9a7b390a523..ed041349176 100644
--- a/src/test/stdtest/result.rs
+++ b/src/test/stdtest/result.rs
@@ -1,4 +1,6 @@
-import std::result;
+import core::*;
+
+import result;
 
 fn op1() -> result::t<int, str> { result::ok(666) }
 
diff --git a/src/test/stdtest/rope.rs b/src/test/stdtest/rope.rs
index 1ed920f2fb9..d59676522b7 100644
--- a/src/test/stdtest/rope.rs
+++ b/src/test/stdtest/rope.rs
@@ -1,8 +1,10 @@
-import std::str;
+import core::*;
+
+import str;
 import std::rope::*;
-import std::option;
-import std::uint;
-import std::vec;
+import option;
+import uint;
+import vec;
 
 //Utility function, used for sanity check
 fn rope_to_string(r: rope) -> str {
diff --git a/src/test/stdtest/run.rs b/src/test/stdtest/run.rs
index 7b8248833b1..9f6bc4c424d 100644
--- a/src/test/stdtest/run.rs
+++ b/src/test/stdtest/run.rs
@@ -1,10 +1,12 @@
+import core::*;
+
 use std;
 import std::run;
 import std::os;
 import std::io;
-import std::option;
-import std::str;
-import std::ctypes::fd_t;
+import option;
+import str;
+import ctypes::fd_t;
 
 // Regression test for memory leaks
 #[ignore(cfg(target_os = "win32"))] // FIXME
diff --git a/src/test/stdtest/sha1.rs b/src/test/stdtest/sha1.rs
index 8731692169b..e1b8a4a8d59 100644
--- a/src/test/stdtest/sha1.rs
+++ b/src/test/stdtest/sha1.rs
@@ -1,11 +1,11 @@
-
+import core::*;
 
 // -*- rust -*-
 
 use std;
 import std::sha1;
-import std::vec;
-import std::str;
+import vec;
+import str;
 
 #[test]
 fn test() {
diff --git a/src/test/stdtest/sort.rs b/src/test/stdtest/sort.rs
index 9e362f0c988..717a1d829a6 100644
--- a/src/test/stdtest/sort.rs
+++ b/src/test/stdtest/sort.rs
@@ -1,8 +1,9 @@
+import core::*;
 
 use std;
 
 fn check_sort(v1: [int], v2: [int]) {
-    let len = std::vec::len::<int>(v1);
+    let len = vec::len::<int>(v1);
     fn lteq(&&a: int, &&b: int) -> bool { ret a <= b; }
     let f = lteq;
     let v3 = std::sort::merge_sort::<int>(f, v1);
diff --git a/src/test/stdtest/str.rs b/src/test/stdtest/str.rs
index cc23eb5bb1b..d540f32ea51 100644
--- a/src/test/stdtest/str.rs
+++ b/src/test/stdtest/str.rs
@@ -1,5 +1,7 @@
-import std::str;
-import std::vec;
+import core::*;
+
+import str;
+import vec;
 
 #[test]
 fn test_eq() {
@@ -333,6 +335,6 @@ fn iter_chars() {
 fn escape() {
     assert(str::escape("abcdef") == "abcdef");
     assert(str::escape("abc\\def") == "abc\\\\def");
-    assert(str::escape("abc\ndef") == "abc\\x0adef");
+    assert(str::escape("abc\ndef") == "abc\\ndef");
     assert(str::escape("abc\"def") == "abc\\\"def");
 }
diff --git a/src/test/stdtest/sys.rs b/src/test/stdtest/sys.rs
index 8098d94a0a9..35e14b5df1d 100644
--- a/src/test/stdtest/sys.rs
+++ b/src/test/stdtest/sys.rs
@@ -1,4 +1,6 @@
-import std::sys;
+import core::*;
+
+import sys;
 
 #[test]
 fn last_os_error() {
diff --git a/src/test/stdtest/task.rs b/src/test/stdtest/task.rs
index a444fbbcc08..78e85c881b0 100644
--- a/src/test/stdtest/task.rs
+++ b/src/test/stdtest/task.rs
@@ -1,6 +1,8 @@
+import core::*;
+
 use std;
-import std::task;
-import std::comm;
+import task;
+import comm;
 
 #[test]
 fn test_sleep() { task::sleep(1000000u); }
diff --git a/src/test/stdtest/tempfile.rs b/src/test/stdtest/tempfile.rs
index 2f78d3e8a92..7db30fa67a1 100644
--- a/src/test/stdtest/tempfile.rs
+++ b/src/test/stdtest/tempfile.rs
@@ -1,7 +1,10 @@
+import core::*;
+
 use std;
+import option;
 import std::fs;
-import std::option::some;
-import std::str;
+import option::some;
+import str;
 import std::tempfile;
 
 #[test]
diff --git a/src/test/stdtest/test.rs b/src/test/stdtest/test.rs
index d6001ebbe54..0de4c1820a8 100644
--- a/src/test/stdtest/test.rs
+++ b/src/test/stdtest/test.rs
@@ -1,8 +1,10 @@
+import core::*;
+
 import std::test;
-import std::str;
-import std::option;
-import std::either;
-import std::vec;
+import str;
+import option;
+import either;
+import vec;
 
 #[test]
 fn do_not_run_ignored_tests() {
diff --git a/src/test/stdtest/treemap.rs b/src/test/stdtest/treemap.rs
index 2fba1ebb196..90aba286e6e 100644
--- a/src/test/stdtest/treemap.rs
+++ b/src/test/stdtest/treemap.rs
@@ -1,8 +1,11 @@
+import core::*;
+
 use std;
+import option;
 import std::treemap::*;
-import std::option::some;
-import std::option::none;
-import std::str;
+import option::some;
+import option::none;
+import str;
 
 #[test]
 fn init_treemap() { let _m = init::<int, int>(); }
diff --git a/src/test/stdtest/tri.rs b/src/test/stdtest/tri.rs
index 4ea87c1270e..c560bc0b681 100644
--- a/src/test/stdtest/tri.rs
+++ b/src/test/stdtest/tri.rs
@@ -1,3 +1,5 @@
+import core::*;
+
 use std;
 
 import std::tri;
diff --git a/src/test/stdtest/uint.rs b/src/test/stdtest/uint.rs
index adb1cde32a9..43187994829 100644
--- a/src/test/stdtest/uint.rs
+++ b/src/test/stdtest/uint.rs
@@ -1,9 +1,10 @@
-
+import core::*;
 
 // -*- rust -*-
 use std;
-import std::uint;
-import std::str::bytes;
+import str;
+import uint;
+import str::bytes;
 
 #[test]
 fn test_from_str() {
diff --git a/src/test/stdtest/unsafe.rs b/src/test/stdtest/unsafe.rs
index 673e14c01f4..b8197cf4c23 100644
--- a/src/test/stdtest/unsafe.rs
+++ b/src/test/stdtest/unsafe.rs
@@ -1,4 +1,6 @@
-import std::unsafe;
+import core::*;
+
+import unsafe;
 
 #[test]
 fn reinterpret_cast() unsafe {
diff --git a/src/test/stdtest/uv.rs b/src/test/stdtest/uv.rs
index 1dda6957a5d..5529ee7a2bb 100644
--- a/src/test/stdtest/uv.rs
+++ b/src/test/stdtest/uv.rs
@@ -1,8 +1,11 @@
+
 #[cfg(target_os = "linux")];
 #[cfg(target_os = "macos")];
 
+import core::*;
+
 import std::uv;
-import std::ptr;
+import ptr;
 
 #[test]
 fn sanity_check() {
diff --git a/src/test/stdtest/vec.rs b/src/test/stdtest/vec.rs
index 3d04e6d3a2e..19ff2d59cc5 100644
--- a/src/test/stdtest/vec.rs
+++ b/src/test/stdtest/vec.rs
@@ -1,11 +1,12 @@
+import core::*;
+
+import vec;
+import vec::*;
+import option;
+import option::none;
+import option::some;
+import task;
 
-use std;
-import std::vec;
-import std::vec::*;
-import std::option;
-import std::option::none;
-import std::option::some;
-import std::task;
 
 fn square(n: uint) -> uint { ret n * n; }