diff options
Diffstat (limited to 'src/libsyntax/ext')
30 files changed, 36 insertions, 36 deletions
diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs index 8c1e27d8b01..b8a4b6d34f4 100644 --- a/src/libsyntax/ext/asm.rs +++ b/src/libsyntax/ext/asm.rs @@ -20,7 +20,7 @@ use parse; use parse::token::InternedString; use parse::token; -use std::vec_ng::Vec; +use std::vec::Vec; enum State { Asm, diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index df2c265e6eb..e456b62e5e7 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -20,7 +20,7 @@ use parse::token::{InternedString, intern, str_to_ident}; use util::small_vector::SmallVector; use collections::HashMap; -use std::vec_ng::Vec; +use std::vec::Vec; // new-style macro! tt code: // diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index 7c42476bc01..7cf27e81ca0 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -21,7 +21,7 @@ use opt_vec::OptVec; use parse::token::special_idents; use parse::token; -use std::vec_ng::Vec; +use std::vec::Vec; pub struct Field { ident: ast::Ident, @@ -585,7 +585,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> { fn expr_vec_ng(&self, sp: Span) -> @ast::Expr { self.expr_call_global(sp, vec!(self.ident_of("std"), - self.ident_of("vec_ng"), + self.ident_of("vec"), self.ident_of("Vec"), self.ident_of("new")), Vec::new()) diff --git a/src/libsyntax/ext/bytes.rs b/src/libsyntax/ext/bytes.rs index 6123fd4d3d4..174f36146aa 100644 --- a/src/libsyntax/ext/bytes.rs +++ b/src/libsyntax/ext/bytes.rs @@ -17,7 +17,7 @@ use ext::base; use ext::build::AstBuilder; use std::char; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> base::MacResult { // Gather all argument expressions diff --git a/src/libsyntax/ext/cfg.rs b/src/libsyntax/ext/cfg.rs index 5d11a0d1e2f..e885119118c 100644 --- a/src/libsyntax/ext/cfg.rs +++ b/src/libsyntax/ext/cfg.rs @@ -26,7 +26,7 @@ use parse::token::InternedString; use parse::token; use parse; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_cfg(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> base::MacResult { let mut p = parse::new_parser_from_tts(cx.parse_sess(), diff --git a/src/libsyntax/ext/concat_idents.rs b/src/libsyntax/ext/concat_idents.rs index ee3adb7aad8..2aeda30695e 100644 --- a/src/libsyntax/ext/concat_idents.rs +++ b/src/libsyntax/ext/concat_idents.rs @@ -15,7 +15,7 @@ use ext::base; use opt_vec; use parse::token; use parse::token::{str_to_ident}; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> base::MacResult { diff --git a/src/libsyntax/ext/deriving/clone.rs b/src/libsyntax/ext/deriving/clone.rs index e63363c608b..a0aa1bb3710 100644 --- a/src/libsyntax/ext/deriving/clone.rs +++ b/src/libsyntax/ext/deriving/clone.rs @@ -14,7 +14,7 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_clone(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/cmp/eq.rs b/src/libsyntax/ext/deriving/cmp/eq.rs index 1e7199ccc95..80e56f0e407 100644 --- a/src/libsyntax/ext/deriving/cmp/eq.rs +++ b/src/libsyntax/ext/deriving/cmp/eq.rs @@ -14,7 +14,7 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_eq(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/cmp/ord.rs b/src/libsyntax/ext/deriving/cmp/ord.rs index 66f45988239..caad6772b19 100644 --- a/src/libsyntax/ext/deriving/cmp/ord.rs +++ b/src/libsyntax/ext/deriving/cmp/ord.rs @@ -15,7 +15,7 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_ord(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/cmp/totaleq.rs b/src/libsyntax/ext/deriving/cmp/totaleq.rs index 2b3c0b9ea69..3292246bf0b 100644 --- a/src/libsyntax/ext/deriving/cmp/totaleq.rs +++ b/src/libsyntax/ext/deriving/cmp/totaleq.rs @@ -14,7 +14,7 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_totaleq(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/cmp/totalord.rs b/src/libsyntax/ext/deriving/cmp/totalord.rs index 89a344bdb7b..d8c2eea9896 100644 --- a/src/libsyntax/ext/deriving/cmp/totalord.rs +++ b/src/libsyntax/ext/deriving/cmp/totalord.rs @@ -16,7 +16,7 @@ use ext::build::AstBuilder; use ext::deriving::generic::*; use std::cmp::{Ordering, Equal, Less, Greater}; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_totalord(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/decodable.rs b/src/libsyntax/ext/deriving/decodable.rs index bc6d69c7cca..e5e11ce878c 100644 --- a/src/libsyntax/ext/deriving/decodable.rs +++ b/src/libsyntax/ext/deriving/decodable.rs @@ -21,7 +21,7 @@ use ext::deriving::generic::*; use parse::token::InternedString; use parse::token; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_decodable(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/default.rs b/src/libsyntax/ext/deriving/default.rs index 8259459f57a..2015aa99717 100644 --- a/src/libsyntax/ext/deriving/default.rs +++ b/src/libsyntax/ext/deriving/default.rs @@ -14,7 +14,7 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_default(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/encodable.rs b/src/libsyntax/ext/deriving/encodable.rs index 091ff7b9c90..0550e64bef8 100644 --- a/src/libsyntax/ext/deriving/encodable.rs +++ b/src/libsyntax/ext/deriving/encodable.rs @@ -89,7 +89,7 @@ use ext::build::AstBuilder; use ext::deriving::generic::*; use parse::token; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_encodable(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs index d24bb2802c6..dce777aaaae 100644 --- a/src/libsyntax/ext/deriving/generic.rs +++ b/src/libsyntax/ext/deriving/generic.rs @@ -187,8 +187,8 @@ use codemap::Span; use opt_vec; use parse::token::InternedString; -use std::vec_ng::Vec; -use std::vec_ng; +use std::vec::Vec; +use std::vec; pub use self::ty::*; mod ty; @@ -407,7 +407,7 @@ impl<'a> TraitDef<'a> { cx.item( self.span, ident, - vec_ng::append(vec!(attr), self.attributes.as_slice()), + vec::append(vec!(attr), self.attributes.as_slice()), ast::ItemImpl(trait_generics, opt_trait_ref, self_type, methods.map(|x| *x))) } diff --git a/src/libsyntax/ext/deriving/hash.rs b/src/libsyntax/ext/deriving/hash.rs index a94feee9d37..366647cc371 100644 --- a/src/libsyntax/ext/deriving/hash.rs +++ b/src/libsyntax/ext/deriving/hash.rs @@ -14,7 +14,7 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_hash(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/primitive.rs b/src/libsyntax/ext/deriving/primitive.rs index 190f009103f..35c1437a176 100644 --- a/src/libsyntax/ext/deriving/primitive.rs +++ b/src/libsyntax/ext/deriving/primitive.rs @@ -16,7 +16,7 @@ use ext::build::AstBuilder; use ext::deriving::generic::*; use parse::token::InternedString; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/rand.rs b/src/libsyntax/ext/deriving/rand.rs index b8ef9d98b29..4ae140406c3 100644 --- a/src/libsyntax/ext/deriving/rand.rs +++ b/src/libsyntax/ext/deriving/rand.rs @@ -15,7 +15,7 @@ use ext::base::ExtCtxt; use ext::build::{AstBuilder}; use ext::deriving::generic::*; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_rand(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/show.rs b/src/libsyntax/ext/deriving/show.rs index 51399d8efab..d86fff5a4aa 100644 --- a/src/libsyntax/ext/deriving/show.rs +++ b/src/libsyntax/ext/deriving/show.rs @@ -19,7 +19,7 @@ use ext::deriving::generic::*; use parse::token; use collections::HashMap; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_show(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/deriving/ty.rs b/src/libsyntax/ext/deriving/ty.rs index 60166f30f1e..22d91956552 100644 --- a/src/libsyntax/ext/deriving/ty.rs +++ b/src/libsyntax/ext/deriving/ty.rs @@ -20,7 +20,7 @@ use ext::build::AstBuilder; use codemap::{Span,respan}; use opt_vec; -use std::vec_ng::Vec; +use std::vec::Vec; /// The types of pointers pub enum PtrTy<'a> { diff --git a/src/libsyntax/ext/deriving/zero.rs b/src/libsyntax/ext/deriving/zero.rs index 98c0ec9d072..d788bafc9b2 100644 --- a/src/libsyntax/ext/deriving/zero.rs +++ b/src/libsyntax/ext/deriving/zero.rs @@ -14,7 +14,7 @@ use ext::base::ExtCtxt; use ext::build::AstBuilder; use ext::deriving::generic::*; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_deriving_zero(cx: &mut ExtCtxt, span: Span, diff --git a/src/libsyntax/ext/env.rs b/src/libsyntax/ext/env.rs index 0c7b92d0373..bb9e5afaed4 100644 --- a/src/libsyntax/ext/env.rs +++ b/src/libsyntax/ext/env.rs @@ -22,7 +22,7 @@ use ext::build::AstBuilder; use parse::token; use std::os; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_option_env(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) -> base::MacResult { diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 49058917e30..4134b23125e 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -32,7 +32,7 @@ use util::small_vector::SmallVector; use std::cast; use std::unstable::dynamic_lib::DynamicLibrary; use std::os; -use std::vec_ng::Vec; +use std::vec::Vec; pub fn expand_expr(e: @ast::Expr, fld: &mut MacroExpander) -> @ast::Expr { match e.node { @@ -979,7 +979,7 @@ mod test { use visit; use visit::Visitor; - use std::vec_ng::Vec; + use std::vec::Vec; // a visitor that extracts the paths // from a given thingy and puts them in a mutable diff --git a/src/libsyntax/ext/format.rs b/src/libsyntax/ext/format.rs index 3bfc4f6e51d..743fe798480 100644 --- a/src/libsyntax/ext/format.rs +++ b/src/libsyntax/ext/format.rs @@ -21,7 +21,7 @@ use rsparse = parse; use std::fmt::parse; use collections::{HashMap, HashSet}; use std::slice; -use std::vec_ng::Vec; +use std::vec::Vec; #[deriving(Eq)] enum ArgumentType { diff --git a/src/libsyntax/ext/mtwt.rs b/src/libsyntax/ext/mtwt.rs index b04e1dfd8b5..ab5f3fbf3a6 100644 --- a/src/libsyntax/ext/mtwt.rs +++ b/src/libsyntax/ext/mtwt.rs @@ -20,7 +20,7 @@ use ast::{Ident, Mrk, Name, SyntaxContext}; use std::cell::RefCell; use std::local_data; use std::rc::Rc; -use std::vec_ng::Vec; +use std::vec::Vec; use collections::HashMap; @@ -281,7 +281,7 @@ mod tests { use super::{resolve, xorPush, new_mark_internal, new_sctable_internal}; use super::{new_rename_internal, marksof_internal, resolve_internal}; use super::{SCTable, EmptyCtxt, Mark, Rename, IllegalCtxt}; - use std::vec_ng::Vec; + use std::vec::Vec; use collections::HashMap; #[test] fn xorpush_test () { diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index e96597d4159..5b66184b16c 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -17,7 +17,7 @@ use parse::token::*; use parse::token; use parse; -use std::vec_ng::Vec; +use std::vec::Vec; /** * @@ -37,7 +37,7 @@ pub mod rt { use parse; use print::pprust; - use std::vec_ng::Vec; + use std::vec::Vec; pub use ast::*; pub use parse::token::*; diff --git a/src/libsyntax/ext/registrar.rs b/src/libsyntax/ext/registrar.rs index d8bf726da79..db59388e24f 100644 --- a/src/libsyntax/ext/registrar.rs +++ b/src/libsyntax/ext/registrar.rs @@ -15,7 +15,7 @@ use diagnostic; use visit; use visit::Visitor; -use std::vec_ng::Vec; +use std::vec::Vec; struct MacroRegistrarContext { registrars: Vec<(ast::NodeId, Span)> , diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 698bde4578c..f5c29840e48 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -22,7 +22,7 @@ use parse::token::{Token, EOF, Nonterminal}; use parse::token; use collections::HashMap; -use std::vec_ng::Vec; +use std::vec::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 3f4ed0b1e8e..d283d6d7142 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -28,7 +28,7 @@ use print; use util::small_vector::SmallVector; use std::cell::RefCell; -use std::vec_ng::Vec; +use std::vec::Vec; struct ParserAnyMacro<'a> { parser: RefCell<Parser<'a>>, diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index e120f07742e..19af4eed4c3 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -18,7 +18,7 @@ use parse::token; use parse::lexer::TokenAndSpan; use std::cell::{Cell, RefCell}; -use std::vec_ng::Vec; +use std::vec::Vec; use collections::HashMap; ///an unzipping of `TokenTree`s |