librustc: Stop reexporting the standard modules from prelude.

5 files changed, 18 insertions, 0 deletions

diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs
index 3fa0fa3b0f0..001a693d1ae 100644
--- a/src/libsyntax/parse/comments.rs
+++ b/src/libsyntax/parse/comments.rs
@@ -20,6 +20,10 @@ use parse::lexer;
 use parse::token;
 use parse;
 
+use core::io;
+use core::str;
+use core::uint;
+
 #[deriving(Eq)]
 pub enum cmnt_style {
     isolated, // No code on either side of each line of the comment
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index eabe664d8ef..4a9ef2faa54 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/src/libsyntax/parse/lexer.rs
@@ -18,6 +18,11 @@ use ext::tt::transcribe::{tt_next_token};
 use ext::tt::transcribe::{dup_tt_reader};
 use parse::token;
 
+use core::char;
+use core::either;
+use core::str;
+use core::u64;
+
 pub use ext::tt::transcribe::{TtReader, new_tt_reader};
 
 pub trait reader {
diff --git a/src/libsyntax/parse/obsolete.rs b/src/libsyntax/parse/obsolete.rs
index 9a8001386ab..085d24d7e68 100644
--- a/src/libsyntax/parse/obsolete.rs
+++ b/src/libsyntax/parse/obsolete.rs
@@ -26,6 +26,7 @@ use parse::parser::Parser;
 use parse::token::{keywords, Token};
 use parse::token;
 
+use core::str;
 use core::to_bytes;
 
 /// The specific types of unsupported syntax
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index de93bb3712b..27dfc2c0a46 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -92,9 +92,11 @@ use parse::{new_sub_parser_from_file, next_node_id, ParseSess};
 use opt_vec;
 use opt_vec::OptVec;
 
+use core::char;
 use core::either::Either;
 use core::either;
 use core::hashmap::HashSet;
+use core::str;
 use core::vec;
 
 #[deriving(Eq)]
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index a4b3783f22d..b1a385ada07 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -16,8 +16,14 @@ use parse::token;
 use util::interner::StrInterner;
 use util::interner;
 
+use core::cast;
+use core::char;
 use core::cmp::Equiv;
+use core::hashmap::HashSet;
+use core::local_data;
+use core::str;
 use core::to_bytes;
+use core::vec;
 
 #[deriving(Encodable, Decodable, Eq)]
 pub enum binop {