diff options
Diffstat (limited to 'src/libsyntax/ext')
35 files changed, 39 insertions, 106 deletions
diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index febb6b324b9..532757346d0 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -12,9 +12,6 @@ * Inline assembly support. */ -use core::prelude::*; - -use core::vec; use ast; use codemap::span; use ext::base; @@ -22,6 +19,8 @@ use ext::base::*; use parse; use parse::token; +use std::vec; + enum State { Asm, Outputs, diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index 997f4e2621f..282a28ff9e0 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use core::prelude::*; - -use core::vec; use ast; use ast::Name; use codemap; @@ -22,7 +19,8 @@ use parse; use parse::token; use parse::token::{ident_to_str, intern, str_to_ident}; -use core::hashmap::HashMap; +use std::vec; +use std::hashmap::HashMap; // new-style macro! tt code: // @@ -535,7 +533,7 @@ fn satisfies_pred<K : Eq + Hash + IterBytes,V>(map : &mut HashMap<K,V>, #[cfg(test)] mod test { use super::MapChain; - use core::hashmap::HashMap; + use std::hashmap::HashMap; #[test] fn testenv () { let mut a = HashMap::new(); diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index b6399794477..02d5991e1a7 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 abi::AbiSet; use ast::ident; use ast; diff --git a/src/libsyntax/ext/concat_idents.rs b/src/libsyntax/ext/concat_idents.rs index e7fb15fbd51..80ab54b7e2c 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/clone.rs b/src/libsyntax/ext/deriving/clone.rs index 4fc67f2f52e..edaf2b8cae6 100644 --- a/src/libsyntax/ext/deriving/clone.rs +++ b/src/libsyntax/ext/deriving/clone.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::{meta_item, item, expr}; use codemap::span; use ext::base::ExtCtxt; diff --git a/src/libsyntax/ext/deriving/cmp/eq.rs b/src/libsyntax/ext/deriving/cmp/eq.rs index 5fc75511e57..cea88bb7bbb 100644 --- a/src/libsyntax/ext/deriving/cmp/eq.rs +++ b/src/libsyntax/ext/deriving/cmp/eq.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::{meta_item, item, expr}; use codemap::span; use ext::base::ExtCtxt; diff --git a/src/libsyntax/ext/deriving/cmp/ord.rs b/src/libsyntax/ext/deriving/cmp/ord.rs index c60b589dfc3..3b9691cd42c 100644 --- a/src/libsyntax/ext/deriving/cmp/ord.rs +++ b/src/libsyntax/ext/deriving/cmp/ord.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::{meta_item, item, expr}; use codemap::span; diff --git a/src/libsyntax/ext/deriving/cmp/totaleq.rs b/src/libsyntax/ext/deriving/cmp/totaleq.rs index acd2073b273..ccfb34a3a2f 100644 --- a/src/libsyntax/ext/deriving/cmp/totaleq.rs +++ b/src/libsyntax/ext/deriving/cmp/totaleq.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use core::prelude::*; +use std::prelude::*; use ast::{meta_item, item, expr}; use codemap::span; diff --git a/src/libsyntax/ext/deriving/cmp/totalord.rs b/src/libsyntax/ext/deriving/cmp/totalord.rs index 94407cd6e72..84d7320fe1c 100644 --- a/src/libsyntax/ext/deriving/cmp/totalord.rs +++ b/src/libsyntax/ext/deriving/cmp/totalord.rs @@ -8,14 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use core::prelude::*; - use ast::{meta_item, item, expr}; use codemap::span; use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use core::cmp::{Ordering, Equal, Less, Greater}; +use std::cmp::{Ordering, Equal, Less, Greater}; pub fn expand_deriving_totalord(cx: @ExtCtxt, span: span, diff --git a/src/libsyntax/ext/deriving/decodable.rs b/src/libsyntax/ext/deriving/decodable.rs index 7d17f436a41..77dbd96255d 100644 --- a/src/libsyntax/ext/deriving/decodable.rs +++ b/src/libsyntax/ext/deriving/decodable.rs @@ -13,9 +13,8 @@ The compiler code necessary for #[deriving(Decodable)]. See encodable.rs for more. */ -use core::prelude::*; -use core::vec; -use core::uint; +use std::vec; +use std::uint; use ast::{meta_item, item, expr, m_mutbl}; use codemap::span; diff --git a/src/libsyntax/ext/deriving/encodable.rs b/src/libsyntax/ext/deriving/encodable.rs index 2b73dc24d33..5514fd0b6ab 100644 --- a/src/libsyntax/ext/deriving/encodable.rs +++ b/src/libsyntax/ext/deriving/encodable.rs @@ -75,8 +75,6 @@ would yield functions like: } */ -use core::prelude::*; - use ast::{meta_item, item, expr, m_imm, m_mutbl}; use codemap::span; use ext::base::ExtCtxt; diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs index 83e446fa4c6..17bbe7a333e 100644 --- a/src/libsyntax/ext/deriving/generic.rs +++ b/src/libsyntax/ext/deriving/generic.rs @@ -162,8 +162,6 @@ StaticEnum(<ast::enum_def of C>, ~[(<ident of C0>, Left(1)), */ -use core::prelude::*; - use ast; use ast::{enum_def, expr, ident, Generics, struct_def}; @@ -172,8 +170,8 @@ use ext::build::AstBuilder; use codemap::{span,respan}; use opt_vec; -use core::uint; -use core::vec; +use std::uint; +use std::vec; pub use self::ty::*; mod ty; @@ -195,7 +193,7 @@ pub struct TraitDef<'self> { pub struct MethodDef<'self> { /// name of the method name: &'self str, - /// List of generics, e.g. `R: core::rand::Rng` + /// List of generics, e.g. `R: std::rand::Rng` generics: LifetimeBounds<'self>, /// Whether there is a self argument (outer Option) i.e. whether diff --git a/src/libsyntax/ext/deriving/iter_bytes.rs b/src/libsyntax/ext/deriving/iter_bytes.rs index c7949f9a8e3..8403234f892 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::{meta_item, item, expr, and}; use codemap::span; use ext::base::ExtCtxt; diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs index f5170d284c6..537d9efbb26 100644 --- a/src/libsyntax/ext/deriving/mod.rs +++ b/src/libsyntax/ext/deriving/mod.rs @@ -18,8 +18,6 @@ library. */ -use core::prelude::*; - use ast::{enum_def, ident, item, Generics, meta_item, struct_def}; use ext::base::ExtCtxt; use ext::build::AstBuilder; diff --git a/src/libsyntax/ext/deriving/rand.rs b/src/libsyntax/ext/deriving/rand.rs index b890623b963..dfbc028ddf6 100644 --- a/src/libsyntax/ext/deriving/rand.rs +++ b/src/libsyntax/ext/deriving/rand.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::{meta_item, item, expr, ident}; use codemap::span; @@ -17,7 +15,7 @@ use ext::base::ExtCtxt; use ext::build::{AstBuilder, Duplicate}; use ext::deriving::generic::*; -use core::vec; +use std::vec; pub fn expand_deriving_rand(cx: @ExtCtxt, span: span, diff --git a/src/libsyntax/ext/deriving/to_str.rs b/src/libsyntax/ext/deriving/to_str.rs index 4cd168b12c0..d1d4d173a3f 100644 --- a/src/libsyntax/ext/deriving/to_str.rs +++ b/src/libsyntax/ext/deriving/to_str.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::{meta_item, item, expr}; use codemap::span; diff --git a/src/libsyntax/ext/deriving/ty.rs b/src/libsyntax/ext/deriving/ty.rs index d28613f52fa..9da6bf27ead 100644 --- a/src/libsyntax/ext/deriving/ty.rs +++ b/src/libsyntax/ext/deriving/ty.rs @@ -13,8 +13,6 @@ A mini version of ast::Ty, which is easier to use, and features an explicit `Self` type to use when specifying impls to be derived. */ -use core::prelude::*; - use ast; use ast::{expr,Generics,ident}; use ext::base::ExtCtxt; @@ -29,7 +27,7 @@ pub enum PtrTy<'self> { Borrowed(Option<&'self str>, ast::mutability), // &['lifetime] [mut] } -/// A path, e.g. `::core::option::Option::<int>` (global). Has support +/// A path, e.g. `::std::option::Option::<int>` (global). Has support /// for type parameters and a lifetime. pub struct Path<'self> { path: ~[&'self str], diff --git a/src/libsyntax/ext/deriving/zero.rs b/src/libsyntax/ext/deriving/zero.rs index 121d8351ee4..471e7212352 100644 --- a/src/libsyntax/ext/deriving/zero.rs +++ b/src/libsyntax/ext/deriving/zero.rs @@ -8,15 +8,13 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use core::prelude::*; - use ast::{meta_item, item, expr}; use codemap::span; use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use core::vec; +use std::vec; pub fn expand_deriving_zero(cx: @ExtCtxt, span: span, diff --git a/src/libsyntax/ext/env.rs b/src/libsyntax/ext/env.rs index 34be6fc8143..a6cb6155878 100644 --- a/src/libsyntax/ext/env.rs +++ b/src/libsyntax/ext/env.rs @@ -14,15 +14,13 @@ * interface. */ -use core::prelude::*; - use ast; use codemap::span; use ext::base::*; use ext::base; use ext::build::AstBuilder; -use core::os; +use std::os; pub fn expand_syntax_ext(cx: @ExtCtxt, sp: span, tts: &[ast::token_tree]) -> base::MacResult { diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index f6504e85b43..7fc784320ac 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}; @@ -27,7 +25,7 @@ use parse::token::{ident_to_str, intern}; use visit; use visit::Visitor; -use core::vec; +use std::vec; pub fn expand_expr(extsbox: @mut SyntaxEnv, cx: @ExtCtxt, @@ -758,8 +756,6 @@ mod test { use util::parser_testing::{string_to_item, string_to_pat, strs_to_idents}; use visit::{mk_vt}; - use core::option::{None, Some}; - // make sure that fail! is present #[test] fn fail_exists_test () { let src = @"fn main() { fail!(\"something appropriately gloomy\");}"; diff --git a/src/libsyntax/ext/fmt.rs b/src/libsyntax/ext/fmt.rs index 4c0a85b665a..76073199f64 100644 --- a/src/libsyntax/ext/fmt.rs +++ b/src/libsyntax/ext/fmt.rs @@ -14,17 +14,15 @@ * compiler syntax extension plugin interface. */ -use core::prelude::*; - use ast; use codemap::span; use ext::base::*; use ext::base; use ext::build::AstBuilder; -use core::option; -use core::unstable::extfmt::ct::*; -use core::vec; +use std::option; +use std::unstable::extfmt::ct::*; +use std::vec; use parse::token::{str_to_ident}; pub fn expand_syntax_ext(cx: @ExtCtxt, sp: span, tts: &[ast::token_tree]) @@ -267,7 +265,7 @@ fn pieces_to_expr(cx: @ExtCtxt, sp: span, let mut stms = ~[]; /* Translate each piece (portion of the fmt expression) by invoking the - corresponding function in core::unstable::extfmt. Each function takes a + corresponding function in std::unstable::extfmt. Each function takes a buffer to insert data into along with the data being formatted. */ let npieces = pieces.len(); do vec::consume(pieces) |i, pc| { diff --git a/src/libsyntax/ext/log_syntax.rs b/src/libsyntax/ext/log_syntax.rs index 4b61d4da218..5b789cbc26c 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::prelude::*; - -use core::vec; use ast; use codemap; use ext::base::*; @@ -18,7 +15,8 @@ use ext::base; use print; use parse::token::{get_ident_interner}; -use core::io; +use std::vec; +use std::io; pub fn expand_syntax_ext(cx: @ExtCtxt, sp: codemap::span, 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; diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index 742f5a97825..db1902753a3 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use core::prelude::*; - -use core::vec; use ast; use codemap::{BytePos, Pos, span}; use ext::base::ExtCtxt; @@ -20,6 +17,8 @@ use parse::token::*; use parse::token; use parse; +use std::vec; + /** * * Quasiquoting works via token trees. @@ -32,8 +31,6 @@ use parse; */ pub mod rt { - use core::prelude::*; - use ast; use ext::base::ExtCtxt; use parse; diff --git a/src/libsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs index d92f4e8458b..71dc82be414 100644 --- a/src/libsyntax/ext/source_util.rs +++ b/src/libsyntax/ext/source_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 codemap; use codemap::{Pos, ExpandedFrom, span}; @@ -21,9 +19,9 @@ use parse; use parse::token::{get_ident_interner}; use print::pprust; -use core::io; -use core::result; -use core::vec; +use std::io; +use std::result; +use std::vec; // These macros all relate to the file system; they either return // the column/row/filename of the expression, or they include diff --git a/src/libsyntax/ext/trace_macros.rs b/src/libsyntax/ext/trace_macros.rs index 09965b921c1..299706b2d40 100644 --- a/src/libsyntax/ext/trace_macros.rs +++ b/src/libsyntax/ext/trace_macros.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use core::prelude::*; - -use core::vec; use ast; use codemap::span; use ext::base::ExtCtxt; @@ -19,6 +16,8 @@ use parse::lexer::{new_tt_reader, reader}; use parse::parser::Parser; use parse::token::keywords; +use std::vec; + pub fn expand_trace_macros(cx: @ExtCtxt, sp: span, tt: &[ast::token_tree]) diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index f2b57db06c1..7c69bdd01c8 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -10,8 +10,6 @@ // Earley-like parser for macros. -use core::prelude::*; - use ast; use ast::{matcher, match_tok, match_seq, match_nonterminal, ident}; use codemap::{BytePos, mk_sp}; @@ -22,9 +20,9 @@ use parse::parser::Parser; use parse::token::{Token, EOF, to_str, nonterminal, get_ident_interner, ident_to_str}; use parse::token; -use core::hashmap::HashMap; -use core::uint; -use core::vec; +use std::hashmap::HashMap; +use std::uint; +use std::vec; /* This is an Earley-like parser, without support for in-grammar nonterminals, only by calling out to the main rust parser for named nonterminals (which it diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 2b65e6599f6..80dd0c7247b 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -8,9 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use core::prelude::*; - -use core::vec; use ast::{ident, matcher_, matcher, match_tok, match_nonterminal, match_seq}; use ast::{tt_delim}; use ast; @@ -26,7 +23,8 @@ use parse::token::{get_ident_interner, special_idents, gensym_ident, ident_to_st use parse::token::{FAT_ARROW, SEMI, nt_matchers, nt_tt}; use print; -use core::io; +use std::vec; +use std::io; pub fn add_new_extension(cx: @ExtCtxt, sp: span, diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index abefbedaff0..92feaa154fe 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,8 @@ use parse::token::{EOF, INTERPOLATED, IDENT, Token, nt_ident}; use parse::token::{ident_to_str}; use parse::lexer::TokenAndSpan; -use core::hashmap::HashMap; -use core::option; +use std::hashmap::HashMap; +use std::option; ///an unzipping of `token_tree`s struct TtFrame { |