auto merge of #7365 : cmr/rust/syntax_cleanup, r=Aatch

Sets the stage for further cleanup (especially mass-slaughter of `@`)

7 files changed, 2 insertions, 15 deletions

diff --git a/src/libsyntax/ext/pipes/ast_builder.rs b/src/libsyntax/ext/pipes/ast_builder.rs
index 99ffd78d7ba..1af6e7810a5 100644
--- a/src/libsyntax/ext/pipes/ast_builder.rs
+++ b/src/libsyntax/ext/pipes/ast_builder.rs
@@ -13,13 +13,11 @@
 // To start with, it will be use dummy spans, but it might someday do
 // something smarter.
 
-use core::prelude::*;
-
 use ast::ident;
 use ast;
 use codemap::span;
 
-use core::vec;
+use std::vec;
 
 // Transitional reexports so qquote can find the paths it is looking for
 mod syntax {
diff --git a/src/libsyntax/ext/pipes/check.rs b/src/libsyntax/ext/pipes/check.rs
index c1b9b051ec9..8c2898737a3 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::ExtCtxt;
diff --git a/src/libsyntax/ext/pipes/liveness.rs b/src/libsyntax/ext/pipes/liveness.rs
index 8b044bd14e1..b1f98d78fb3 100644
--- a/src/libsyntax/ext/pipes/liveness.rs
+++ b/src/libsyntax/ext/pipes/liveness.rs
@@ -37,8 +37,6 @@ updating the states using rule (2) until there are no changes.
 
 */
 
-use core::prelude::*;
-
 use ext::base::ExtCtxt;
 use ext::pipes::proto::{protocol_};
 
diff --git a/src/libsyntax/ext/pipes/mod.rs b/src/libsyntax/ext/pipes/mod.rs
index 3f4b5ee54f1..165d3c39c6b 100644
--- a/src/libsyntax/ext/pipes/mod.rs
+++ b/src/libsyntax/ext/pipes/mod.rs
@@ -52,7 +52,6 @@ use ext::pipes::pipec::gen_init;
 use ext::pipes::proto::visit;
 use parse::lexer::{new_tt_reader, reader};
 use parse::parser::Parser;
-use core::option::None;
 
 pub mod ast_builder;
 pub mod parse_proto;
diff --git a/src/libsyntax/ext/pipes/parse_proto.rs b/src/libsyntax/ext/pipes/parse_proto.rs
index 11db1a5da29..21bb8266239 100644
--- a/src/libsyntax/ext/pipes/parse_proto.rs
+++ b/src/libsyntax/ext/pipes/parse_proto.rs
@@ -10,8 +10,6 @@
 
 // Parsing pipes protocols from token trees.
 
-use core::prelude::*;
-
 use ast_util;
 use ext::pipes::proto::*;
 use parse::common::SeqSep;
diff --git a/src/libsyntax/ext/pipes/pipec.rs b/src/libsyntax/ext/pipes/pipec.rs
index da5455d4332..a75a20a0fa9 100644
--- a/src/libsyntax/ext/pipes/pipec.rs
+++ b/src/libsyntax/ext/pipes/pipec.rs
@@ -10,8 +10,6 @@
 
 // A protocol compiler for Rust.
 
-use core::prelude::*;
-
 use ast;
 use codemap::{dummy_sp, spanned};
 use ext::base::ExtCtxt;
@@ -23,7 +21,7 @@ use ext::quote::rt::*;
 use opt_vec;
 use opt_vec::OptVec;
 
-use core::vec;
+use std::vec;
 
 pub trait gen_send {
     fn gen_send(&mut self, cx: @ExtCtxt, try: bool) -> @ast::item;
diff --git a/src/libsyntax/ext/pipes/proto.rs b/src/libsyntax/ext/pipes/proto.rs
index 87aaf7781fa..e86ced847d7 100644
--- a/src/libsyntax/ext/pipes/proto.rs
+++ b/src/libsyntax/ext/pipes/proto.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::ExtCtxt;