Copy first batch of material from libstd to libcore.

5 files changed, 10 insertions, 9 deletions

diff --git a/src/fuzzer/ast_match.rs b/src/fuzzer/ast_match.rs
index e8cad5edce5..46d9613fbc7 100644
--- a/src/fuzzer/ast_match.rs
+++ b/src/fuzzer/ast_match.rs
@@ -1,5 +1,5 @@
 use std;
-import std::vec;
+import vec;
 
 fn vec_equal<T>(v: [T], u: [T], element_equality_test: fn(T, T) -> bool) ->
    bool {
diff --git a/src/fuzzer/cycles.rs b/src/fuzzer/cycles.rs
index 6f91839cc60..792d3b77686 100644
--- a/src/fuzzer/cycles.rs
+++ b/src/fuzzer/cycles.rs
@@ -1,7 +1,7 @@
 use std;
-import std::vec;
+import vec;
 import std::rand;
-import std::option;
+import option;
 
 // random uint less than n
 fn under(r : rand::rng, n : uint) -> uint { assert n != 0u; r.next() as uint % n }
diff --git a/src/fuzzer/fuzzer.rs b/src/fuzzer/fuzzer.rs
index d6c57424b1e..08b95b6163d 100644
--- a/src/fuzzer/fuzzer.rs
+++ b/src/fuzzer/fuzzer.rs
@@ -1,4 +1,5 @@
-import std::{fs, io, math, vec, str, int, uint, option, result};
+import core::{vec, str, int, uint, option, result};
+import std::{fs, io, math};
 
 import rustc::syntax::{ast, ast_util, fold, visit, codemap};
 import rustc::syntax::parse::parser;
diff --git a/src/fuzzer/ivec_fuzz.rs b/src/fuzzer/ivec_fuzz.rs
index 66b1a60f173..8fbdcc1e96a 100644
--- a/src/fuzzer/ivec_fuzz.rs
+++ b/src/fuzzer/ivec_fuzz.rs
@@ -17,10 +17,10 @@ vec_edits is not an iter because iters might go away.
 */
 
 use std;
-import std::vec;
-import std::vec::slice;
-import std::vec::len;
-import std::int;
+import vec;
+import vec::slice;
+import vec::len;
+import int;
 
 fn vec_omit<T>(v: [T], i: uint) -> [T] {
     slice(v, 0u, i) + slice(v, i + 1u, len(v))
diff --git a/src/fuzzer/rand_util.rs b/src/fuzzer/rand_util.rs
index d59cf06b2a2..a3194568882 100644
--- a/src/fuzzer/rand_util.rs
+++ b/src/fuzzer/rand_util.rs
@@ -1,6 +1,6 @@
 use std;
 import std::rand;
-import std::vec;
+import vec;
 
 // random uint less than n
 fn under(r : rand::rng, n : uint) -> uint { assert n != 0u; r.next() as uint % n }