auto merge of #6075 : thestinger/rust/no-no_core, r=brson

core injection works fine now

46 files changed, 0 insertions, 174 deletions

diff --git a/src/libsyntax/abi.rs b/src/libsyntax/abi.rs
index b6580b4c5a1..75782e9ca67 100644
--- a/src/libsyntax/abi.rs
+++ b/src/libsyntax/abi.rs
@@ -8,9 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
 use core::to_bytes;
-use core::to_str::ToStr;
 
 #[deriving(Eq)]
 pub enum Abi {
diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs
index 05e67196b4c..f9828ad2b9e 100644
--- a/src/libsyntax/ast_map.rs
+++ b/src/libsyntax/ast_map.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use abi::AbiSet;
 use ast::*;
 use ast;
@@ -22,10 +20,7 @@ use parse::token::ident_interner;
 use print::pprust;
 use visit;
 
-use core::cmp;
 use core::hashmap::HashMap;
-use core::str;
-use core::vec;
 
 pub enum path_elt {
     path_mod(ident),
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
index 4ae140a265e..bfacfc38df6 100644
--- a/src/libsyntax/ast_util.rs
+++ b/src/libsyntax/ast_util.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast::*;
 use ast;
 use ast_util;
@@ -18,12 +16,7 @@ use parse::token;
 use visit;
 use opt_vec;
 
-use core::int;
-use core::option;
-use core::str;
 use core::to_bytes;
-use core::vec;
-
 
 pub fn path_name_i(idents: &[ident], intr: @token::ident_interner) -> ~str {
     // FIXME: Bad copies (#2543 -- same for everything else that says "bad")
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
index 98cfdd33ef6..2f8405c6e96 100644
--- a/src/libsyntax/attr.rs
+++ b/src/libsyntax/attr.rs
@@ -10,8 +10,6 @@
 
 // Functions dealing with attributes and meta_items
 
-use core::prelude::*;
-
 use ast;
 use codemap::{spanned, dummy_spanned};
 use attr;
@@ -19,7 +17,6 @@ use codemap::BytePos;
 use diagnostic::span_handler;
 use parse::comments::{doc_comment_style, strip_doc_comment_decoration};
 
-use core::vec;
 use core::hashmap::HashSet;
 use std;
 
diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs
index bd8aa7011b7..1194506a887 100644
--- a/src/libsyntax/codemap.rs
+++ b/src/libsyntax/codemap.rs
@@ -21,12 +21,7 @@ source code snippets, etc.
 
 */
 
-use core::prelude::*;
-
-use core::cmp;
-use core::str;
 use core::to_bytes;
-use core::uint;
 use std::serialize::{Encodable, Decodable, Encoder, Decoder};
 
 pub trait Pos {
diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
index 35022b68ebb..0f2374a892b 100644
--- a/src/libsyntax/diagnostic.rs
+++ b/src/libsyntax/diagnostic.rs
@@ -8,16 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use codemap::{Pos, span};
 use codemap;
 
-use core::io::WriterUtil;
-use core::io;
-use core::str;
-use core::vec;
-
 use std::term;
 
 pub type Emitter = @fn(cmsp: Option<(@codemap::CodeMap, span)>,
diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs
index b070948d405..534027bd295 100644
--- a/src/libsyntax/ext/asm.rs
+++ b/src/libsyntax/ext/asm.rs
@@ -8,14 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
 /*
  * Inline assembly support.
  */
 
-use core::prelude::*;
-
 use ast;
 use codemap::span;
 use ext::base;
diff --git a/src/libsyntax/ext/auto_encode.rs b/src/libsyntax/ext/auto_encode.rs
index 8263fce2356..0d451c66edb 100644
--- a/src/libsyntax/ext/auto_encode.rs
+++ b/src/libsyntax/ext/auto_encode.rs
@@ -88,8 +88,6 @@ node twice.
 
 */
 
-use core::prelude::*;
-
 use ast;
 use ast_util;
 use attr;
@@ -101,8 +99,6 @@ use opt_vec;
 use opt_vec::OptVec;
 use ext::build;
 
-use core::vec;
-
 // Transitional reexports so qquote can find the paths it is looking for
 mod syntax {
     pub use ext;
diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index 4eb48d12bfe..ecbccedbd9d 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use codemap;
 use codemap::{CodeMap, span, ExpnInfo, ExpandedFrom};
@@ -19,7 +17,6 @@ use ext;
 use parse;
 use parse::token;
 
-use core::vec;
 use core::hashmap::HashMap;
 
 // new-style macro! tt code:
diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs
index db4929854b3..c4c2fed778f 100644
--- a/src/libsyntax/ext/build.rs
+++ b/src/libsyntax/ext/build.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use codemap;
 use codemap::span;
@@ -18,8 +16,6 @@ use ext::build;
 
 use opt_vec::OptVec;
 
-use core::option;
-
 pub struct Field {
     ident: ast::ident,
     ex: @ast::expr
diff --git a/src/libsyntax/ext/concat_idents.rs b/src/libsyntax/ext/concat_idents.rs
index f4901191b8a..55e25e69936 100644
--- a/src/libsyntax/ext/concat_idents.rs
+++ b/src/libsyntax/ext/concat_idents.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use codemap::span;
 use ext::base::*;
diff --git a/src/libsyntax/ext/deriving/decodable.rs b/src/libsyntax/ext/deriving/decodable.rs
index df3536a3cae..48f6d5baa8b 100644
--- a/src/libsyntax/ext/deriving/decodable.rs
+++ b/src/libsyntax/ext/deriving/decodable.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use ast::*;
 use ext::base::ext_ctxt;
@@ -19,8 +17,6 @@ use codemap::{span, spanned};
 use ast_util;
 use opt_vec;
 
-use core::uint;
-
 pub fn expand_deriving_decodable(
     cx: @ext_ctxt,
     span: span,
diff --git a/src/libsyntax/ext/deriving/encodable.rs b/src/libsyntax/ext/deriving/encodable.rs
index 6fd27c5f3d7..640d0d0ff2d 100644
--- a/src/libsyntax/ext/deriving/encodable.rs
+++ b/src/libsyntax/ext/deriving/encodable.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use ast::*;
 use ext::base::ext_ctxt;
@@ -19,8 +17,6 @@ use codemap::{span, spanned};
 use ast_util;
 use opt_vec;
 
-use core::uint;
-
 pub fn expand_deriving_encodable(
     cx: @ext_ctxt,
     span: span,
diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs
index 461c99e8442..05941f4cbd6 100644
--- a/src/libsyntax/ext/deriving/generic.rs
+++ b/src/libsyntax/ext/deriving/generic.rs
@@ -125,8 +125,6 @@ For `C0(a)` and `C1 {x}` ,
 
 */
 
-use core::prelude::*;
-
 use ast;
 
 use ast::{
diff --git a/src/libsyntax/ext/deriving/iter_bytes.rs b/src/libsyntax/ext/deriving/iter_bytes.rs
index 85592d142ab..f03306ea07a 100644
--- a/src/libsyntax/ext/deriving/iter_bytes.rs
+++ b/src/libsyntax/ext/deriving/iter_bytes.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use ast::*;
 use ext::base::ext_ctxt;
@@ -19,8 +17,6 @@ use codemap::{span, spanned};
 use ast_util;
 use opt_vec;
 
-use core::uint;
-
 pub fn expand_deriving_iter_bytes(cx: @ext_ctxt,
                                   span: span,
                                   _mitem: @meta_item,
diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs
index 577cf4c01cf..5aeeef2b17a 100644
--- a/src/libsyntax/ext/deriving/mod.rs
+++ b/src/libsyntax/ext/deriving/mod.rs
@@ -11,8 +11,6 @@
 /// The compiler code necessary to implement the #[deriving(Eq)] and
 /// #[deriving(IterBytes)] extensions.
 
-use core::prelude::*;
-
 use ast;
 use ast::{Ty, bind_by_ref, deref, enum_def};
 use ast::{expr, expr_match, ident, item, item_};
@@ -28,8 +26,6 @@ use codemap::{span, respan};
 use parse::token::special_idents::clownshoes_extensions;
 use opt_vec;
 
-use core::uint;
-
 pub mod clone;
 pub mod iter_bytes;
 pub mod encodable;
diff --git a/src/libsyntax/ext/env.rs b/src/libsyntax/ext/env.rs
index c21a9fa8739..5e5fd7d97b1 100644
--- a/src/libsyntax/ext/env.rs
+++ b/src/libsyntax/ext/env.rs
@@ -8,15 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 /*
  * The compiler code necessary to support the env! extension.  Eventually this
  * should all get sucked into either the compiler syntax extension plugin
  * interface.
  */
 
-use core::prelude::*;
-
 use ast;
 use codemap::span;
 use ext::base::*;
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
index 53ebb946114..fde5a259422 100644
--- a/src/libsyntax/ext/expand.rs
+++ b/src/libsyntax/ext/expand.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast::{blk_, attribute_, attr_outer, meta_word};
 use ast::{crate, expr_, expr_mac, mac_invoc_tt};
 use ast::{item_mac, stmt_, stmt_mac, stmt_expr, stmt_semi};
@@ -22,8 +20,6 @@ use fold::*;
 use parse;
 use parse::{parse_item_from_source_str};
 
-use core::vec;
-
 pub fn expand_expr(extsbox: @mut SyntaxEnv,
                    cx: @ext_ctxt,
                    e: &expr_,
diff --git a/src/libsyntax/ext/fmt.rs b/src/libsyntax/ext/fmt.rs
index 6a877040f48..9bbe617eb07 100644
--- a/src/libsyntax/ext/fmt.rs
+++ b/src/libsyntax/ext/fmt.rs
@@ -8,16 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-
 /*
  * The compiler code necessary to support the fmt! extension. Eventually this
  * should all get sucked into either the standard library extfmt module or the
  * compiler syntax extension plugin interface.
  */
 
-use core::prelude::*;
-
 use ast;
 use codemap::span;
 use ext::base::*;
diff --git a/src/libsyntax/ext/log_syntax.rs b/src/libsyntax/ext/log_syntax.rs
index bf4a997bc17..34d6978abdd 100644
--- a/src/libsyntax/ext/log_syntax.rs
+++ b/src/libsyntax/ext/log_syntax.rs
@@ -8,9 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::io::WriterUtil;
-use core::prelude::*;
-
 use ast;
 use codemap;
 use ext::base::*;
diff --git a/src/libsyntax/ext/pipes/ast_builder.rs b/src/libsyntax/ext/pipes/ast_builder.rs
index 9434172c1f4..ede3711b052 100644
--- a/src/libsyntax/ext/pipes/ast_builder.rs
+++ b/src/libsyntax/ext/pipes/ast_builder.rs
@@ -13,8 +13,6 @@
 // To start with, it will be use dummy spans, but it might someday do
 // something smarter.
 
-use core::prelude::*;
-
 use abi::AbiSet;
 use ast::ident;
 use ast;
@@ -26,8 +24,6 @@ use ext::quote::rt::*;
 use opt_vec;
 use opt_vec::OptVec;
 
-use core::vec;
-
 // Transitional reexports so qquote can find the paths it is looking for
 mod syntax {
     pub use ext;
diff --git a/src/libsyntax/ext/pipes/check.rs b/src/libsyntax/ext/pipes/check.rs
index 29c9e86ec62..c2c0c06342b 100644
--- a/src/libsyntax/ext/pipes/check.rs
+++ b/src/libsyntax/ext/pipes/check.rs
@@ -29,8 +29,6 @@ that.
 
 */
 
-use core::prelude::*;
-
 use ast;
 use codemap::span;
 use ext::base::ext_ctxt;
diff --git a/src/libsyntax/ext/pipes/liveness.rs b/src/libsyntax/ext/pipes/liveness.rs
index c6fdf4d9c1b..4597dab89cb 100644
--- a/src/libsyntax/ext/pipes/liveness.rs
+++ b/src/libsyntax/ext/pipes/liveness.rs
@@ -37,12 +37,9 @@ updating the states using rule (2) until there are no changes.
 
 */
 
-use core::prelude::*;
-
 use ext::base::ext_ctxt;
 use ext::pipes::proto::protocol;
 
-use core::str;
 use std::bitv::Bitv;
 
 pub fn analyze(proto: protocol, _cx: @ext_ctxt) {
diff --git a/src/libsyntax/ext/pipes/parse_proto.rs b/src/libsyntax/ext/pipes/parse_proto.rs
index 7339ebdaa98..f9346f49b61 100644
--- a/src/libsyntax/ext/pipes/parse_proto.rs
+++ b/src/libsyntax/ext/pipes/parse_proto.rs
@@ -16,8 +16,6 @@ use parse::common::SeqSep;
 use parse::parser;
 use parse::token;
 
-use core::prelude::*;
-
 pub trait proto_parser {
     fn parse_proto(&self, id: ~str) -> protocol;
     fn parse_state(&self, proto: protocol);
diff --git a/src/libsyntax/ext/pipes/pipec.rs b/src/libsyntax/ext/pipes/pipec.rs
index 105e08e5fb4..e6f5d3608af 100644
--- a/src/libsyntax/ext/pipes/pipec.rs
+++ b/src/libsyntax/ext/pipes/pipec.rs
@@ -20,11 +20,6 @@ use ext::quote::rt::*;
 use opt_vec;
 use opt_vec::OptVec;
 
-use core::prelude::*;
-use core::str;
-use core::to_str::ToStr;
-use core::vec;
-
 pub trait gen_send {
     fn gen_send(&mut self, cx: @ext_ctxt, try: bool) -> @ast::item;
     fn to_ty(&mut self, cx: @ext_ctxt) -> @ast::Ty;
diff --git a/src/libsyntax/ext/pipes/proto.rs b/src/libsyntax/ext/pipes/proto.rs
index 6495750f93b..79072a2f577 100644
--- a/src/libsyntax/ext/pipes/proto.rs
+++ b/src/libsyntax/ext/pipes/proto.rs
@@ -8,15 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use codemap::span;
 use ext::base::ext_ctxt;
 use ext::pipes::ast_builder::{append_types, ext_ctxt_ast_builder, path};
 
-use core::to_str::ToStr;
-
 #[deriving(Eq)]
 pub enum direction { send, recv }
 
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs
index f355d327d4f..f7412a4502c 100644
--- a/src/libsyntax/ext/quote.rs
+++ b/src/libsyntax/ext/quote.rs
@@ -17,8 +17,6 @@ use parse::token::*;
 use parse::token;
 use parse;
 
-use core::prelude::*;
-
 /**
 *
 * Quasiquoting works via token trees.
@@ -36,7 +34,6 @@ pub mod rt {
     use parse;
     use print::pprust;
 
-    use core::prelude::*;
     use core::str;
 
     pub use ast::*;
diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs
index b2de322be55..70aa9472c85 100644
--- a/src/libsyntax/ext/source_util.rs
+++ b/src/libsyntax/ext/source_util.rs
@@ -18,12 +18,6 @@ use ext::build::{mk_base_vec_e, mk_uint, mk_u8, mk_base_str};
 use parse;
 use print::pprust;
 
-use core::io;
-use core::prelude::*;
-use core::result;
-use core::str;
-use core::vec;
-
 // These macros all relate to the file system; they either return
 // the column/row/filename of the expression, or they include
 // a given file into the current one.
diff --git a/src/libsyntax/ext/trace_macros.rs b/src/libsyntax/ext/trace_macros.rs
index 29a959013f2..a29a0f33e0d 100644
--- a/src/libsyntax/ext/trace_macros.rs
+++ b/src/libsyntax/ext/trace_macros.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use codemap::span;
 use ext::base::ext_ctxt;
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs
index 9df7a8e7e1d..e4e033e0fff 100644
--- a/src/libsyntax/ext/tt/macro_parser.rs
+++ b/src/libsyntax/ext/tt/macro_parser.rs
@@ -19,7 +19,6 @@ use parse::parser::Parser;
 use parse::token::{Token, EOF, to_str, nonterminal};
 use parse::token;
 
-use core::prelude::*;
 use core::hashmap::HashMap;
 
 /* This is an Earley-like parser, without support for in-grammar nonterminals,
diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs
index 9a8c288c3a1..39c3c63a9b7 100644
--- a/src/libsyntax/ext/tt/macro_rules.rs
+++ b/src/libsyntax/ext/tt/macro_rules.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
 
 use ast::{ident, matcher_, matcher, match_tok, match_nonterminal, match_seq};
 use ast::{tt_delim};
diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs
index 7ac924444b8..19c83e21a86 100644
--- a/src/libsyntax/ext/tt/transcribe.rs
+++ b/src/libsyntax/ext/tt/transcribe.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use ast::{token_tree, tt_delim, tt_tok, tt_seq, tt_nonterminal,ident};
 use codemap::{span, dummy_sp};
@@ -19,8 +17,6 @@ use parse::token::{EOF, INTERPOLATED, IDENT, Token, nt_ident, ident_interner};
 use parse::lexer::TokenAndSpan;
 
 use core::hashmap::HashMap;
-use core::option;
-use core::vec;
 
 ///an unzipping of `token_tree`s
 struct TtFrame {
diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs
index 768dba21412..da6d0e8bf7b 100644
--- a/src/libsyntax/fold.rs
+++ b/src/libsyntax/fold.rs
@@ -8,15 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast::*;
 use ast;
 use codemap::{span, spanned};
 use opt_vec::OptVec;
 
-use core::vec;
-
 pub trait ast_fold {
     fn fold_crate(@self, &crate) -> crate;
     fn fold_view_item(@self, @view_item) -> @view_item;
diff --git a/src/libsyntax/opt_vec.rs b/src/libsyntax/opt_vec.rs
index c7ca9eba512..88d7c39cc83 100644
--- a/src/libsyntax/opt_vec.rs
+++ b/src/libsyntax/opt_vec.rs
@@ -16,7 +16,6 @@
  * other useful things like `push()` and `len()`.
  */
 
-use core::prelude::*;
 use core::iter;
 use core::iter::BaseIter;
 
diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs
index b73544e95d6..40bfd3d380c 100644
--- a/src/libsyntax/parse/comments.rs
+++ b/src/libsyntax/parse/comments.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use codemap::{BytePos, CharPos, CodeMap, Pos};
 use diagnostic;
@@ -20,12 +18,6 @@ use parse::lexer;
 use parse::token;
 use parse;
 
-use core::io::ReaderUtil;
-use core::io;
-use core::str;
-use core::uint;
-use core::vec;
-
 #[deriving(Eq)]
 pub enum cmnt_style {
     isolated, // No code on either side of each line of the comment
diff --git a/src/libsyntax/parse/common.rs b/src/libsyntax/parse/common.rs
index 2d4a6d47eaa..01f80c032e9 100644
--- a/src/libsyntax/parse/common.rs
+++ b/src/libsyntax/parse/common.rs
@@ -8,16 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use codemap::{BytePos, spanned};
 use parse::lexer::reader;
 use parse::parser::Parser;
 use parse::token;
 
-use core::option::{None, Option, Some};
-
 use opt_vec;
 use opt_vec::OptVec;
 
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index a9edf12f7fa..fa425cf6285 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/src/libsyntax/parse/lexer.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use codemap::{BytePos, CharPos, CodeMap, Pos, span};
 use codemap;
@@ -18,11 +16,6 @@ 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};
 
 //use std;
diff --git a/src/libsyntax/parse/obsolete.rs b/src/libsyntax/parse/obsolete.rs
index 423fc6dca6d..e6e98a35d6e 100644
--- a/src/libsyntax/parse/obsolete.rs
+++ b/src/libsyntax/parse/obsolete.rs
@@ -17,7 +17,6 @@ Obsolete syntax that becomes too hard to parse can be
 removed.
 */
 
-use core::prelude::*;
 
 use ast::{expr, expr_lit, lit_nil};
 use ast;
@@ -26,7 +25,6 @@ use parse::parser::Parser;
 use parse::token::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 d5cb1f5ebac..c35b0e2e8c2 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use abi;
 use abi::AbiSet;
 use ast::{Sigil, BorrowedSigil, ManagedSigil, OwnedSigil};
diff --git a/src/libsyntax/parse/prec.rs b/src/libsyntax/parse/prec.rs
index d8c829740fa..5f37c922c1e 100644
--- a/src/libsyntax/parse/prec.rs
+++ b/src/libsyntax/parse/prec.rs
@@ -13,8 +13,6 @@ use ast::*;
 use parse::token::*;
 use parse::token::Token;
 
-use core::prelude::*;
-
 /// Unary operators have higher precedence than binary
 pub static unop_prec: uint = 100u;
 
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index 2483cacd1a6..413f1688df1 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -8,20 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use ast;
 use ast_util;
 use parse::token;
 use util::interner::Interner;
 use util::interner;
 
-use core::cast;
-use core::char;
 use core::cmp::Equiv;
 use core::hashmap::HashSet;
-use core::str;
-use core::task;
 use core::to_bytes;
 
 #[auto_encode]
diff --git a/src/libsyntax/print/pp.rs b/src/libsyntax/print/pp.rs
index 17add33d673..e2ad5becb12 100644
--- a/src/libsyntax/print/pp.rs
+++ b/src/libsyntax/print/pp.rs
@@ -8,12 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
-use core::io::WriterUtil;
-use core::io;
-use core::vec;
-
 /*
  * This pretty-printer is a direct reimplementation of Philip Karlton's
  * Mesa pretty-printer, as described in appendix A of
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index ab4a8c73588..918fc805194 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
 
 use abi::AbiSet;
 use ast::{RegionTyParamBound, TraitTyParamBound, required, provided};
@@ -29,12 +28,6 @@ use print::pp::{breaks, consistent, inconsistent, eof};
 use print::pp;
 use print::pprust;
 
-use core::char;
-use core::io;
-use core::str;
-use core::u64;
-use core::vec;
-
 // The @ps is stored here to prevent recursive type.
 pub enum ann_node<'self> {
     node_block(@ps, &'self ast::blk),
diff --git a/src/libsyntax/syntax.rc b/src/libsyntax/syntax.rc
index 6e70bd22b4f..2682139ce3f 100644
--- a/src/libsyntax/syntax.rc
+++ b/src/libsyntax/syntax.rc
@@ -12,8 +12,6 @@
        vers = "0.7-pre",
        uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
 
-
-
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
@@ -22,13 +20,8 @@
 #[deny(deprecated_mode)];
 #[deny(deprecated_pattern)];
 
-#[no_core];
-
-extern mod core(vers = "0.7-pre");
 extern mod std(vers = "0.7-pre");
 
-use core::*;
-
 // allow the interner_key macro
 // to escape this module:
 #[macro_escape]
diff --git a/src/libsyntax/util/interner.rs b/src/libsyntax/util/interner.rs
index cda1c6c0df3..9ab7d4bc443 100644
--- a/src/libsyntax/util/interner.rs
+++ b/src/libsyntax/util/interner.rs
@@ -15,7 +15,6 @@
 // allow the interner_key macro to escape this module:
 #[macro_escape];
 
-use core::prelude::*;
 use core::cmp::Equiv;
 use core::hashmap::HashMap;
 
diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs
index 0aaa08f2e78..80df8fb91a5 100644
--- a/src/libsyntax/visit.rs
+++ b/src/libsyntax/visit.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use abi::AbiSet;
 use ast::*;
 use ast;