about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2014-03-20 03:35:51 -0400
committerDaniel Micay <danielmicay@gmail.com>2014-03-20 04:25:32 -0400
commit14f656d1a79fb36ce5435976dd33f57dd09cb9ce (patch)
treebfc7750a0918b56b8e6cd61624dd4917e5cd1075 /src/libsyntax/parse
parent7aded2adb6782d8188a631250ab8d72c82bd070c (diff)
downloadrust-14f656d1a79fb36ce5435976dd33f57dd09cb9ce.tar.gz
rust-14f656d1a79fb36ce5435976dd33f57dd09cb9ce.zip
rename std::vec_ng -> std::vec
Closes #12771
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/attr.rs2
-rw-r--r--src/libsyntax/parse/comments.rs2
-rw-r--r--src/libsyntax/parse/lexer.rs2
-rw-r--r--src/libsyntax/parse/mod.rs4
-rw-r--r--src/libsyntax/parse/parser.rs26
-rw-r--r--src/libsyntax/parse/token.rs2
6 files changed, 19 insertions, 19 deletions
diff --git a/src/libsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs
index 399648ef1d8..e86f6f5be81 100644
--- a/src/libsyntax/parse/attr.rs
+++ b/src/libsyntax/parse/attr.rs
@@ -15,7 +15,7 @@ use parse::token;
 use parse::parser::Parser;
 use parse::token::INTERPOLATED;
 
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 // a parser that can parse attributes.
 pub trait ParserAttr {
diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs
index ed74fd416d1..9bc0fdd3078 100644
--- a/src/libsyntax/parse/comments.rs
+++ b/src/libsyntax/parse/comments.rs
@@ -20,7 +20,7 @@ use parse::token;
 use std::io;
 use std::str;
 use std::uint;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 #[deriving(Clone, Eq)]
 pub enum CommentStyle {
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index 546aefc1297..c34ef465dad 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/src/libsyntax/parse/lexer.rs
@@ -1005,7 +1005,7 @@ mod test {
     use parse::token;
     use parse::token::{str_to_ident};
     use std::io::util;
-    use std::vec_ng::Vec;
+    use std::vec::Vec;
 
     fn mk_sh() -> diagnostic::SpanHandler {
         let emitter = diagnostic::EmitterWriter::new(~util::NullWriter);
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 062bc100863..7e8ca77eb04 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -21,7 +21,7 @@ use std::cell::RefCell;
 use std::io::File;
 use std::rc::Rc;
 use std::str;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 pub mod lexer;
 pub mod parser;
@@ -279,7 +279,7 @@ mod test {
     use std::io;
     use std::io::MemWriter;
     use std::str;
-    use std::vec_ng::Vec;
+    use std::vec::Vec;
     use codemap::{Span, BytePos, Spanned};
     use opt_vec;
     use ast;
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index e1a02d5240f..1c03ab7f0f8 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -82,8 +82,8 @@ use std::cell::Cell;
 use collections::HashSet;
 use std::kinds::marker;
 use std::mem::replace;
-use std::vec_ng::Vec;
-use std::vec_ng;
+use std::vec::Vec;
+use std::vec;
 
 #[allow(non_camel_case_types)]
 #[deriving(Eq)]
@@ -271,7 +271,7 @@ fn maybe_append(lhs: Vec<Attribute> , rhs: Option<Vec<Attribute> >)
              -> Vec<Attribute> {
     match rhs {
         None => lhs,
-        Some(ref attrs) => vec_ng::append(lhs, attrs.as_slice())
+        Some(ref attrs) => vec::append(lhs, attrs.as_slice())
     }
 }
 
@@ -407,7 +407,7 @@ impl<'a> Parser<'a> {
         } else if inedible.contains(&self.token) {
             // leave it in the input
         } else {
-            let expected = vec_ng::append(edible.iter()
+            let expected = vec::append(edible.iter()
                                                 .map(|x| (*x).clone())
                                                 .collect(),
                                           inedible);
@@ -449,7 +449,7 @@ impl<'a> Parser<'a> {
         match e.node {
             ExprPath(..) => {
                 // might be unit-struct construction; check for recoverableinput error.
-                let expected = vec_ng::append(edible.iter()
+                let expected = vec::append(edible.iter()
                                                     .map(|x| (*x).clone())
                                                     .collect(),
                                               inedible);
@@ -472,7 +472,7 @@ impl<'a> Parser<'a> {
         debug!("commit_stmt {:?}", s);
         let _s = s; // unused, but future checks might want to inspect `s`.
         if self.last_token.as_ref().map_or(false, |t| is_ident_or_path(*t)) {
-            let expected = vec_ng::append(edible.iter()
+            let expected = vec::append(edible.iter()
                                                 .map(|x| (*x).clone())
                                                 .collect(),
                                           inedible.as_slice());
@@ -1113,7 +1113,7 @@ impl<'a> Parser<'a> {
                 debug!("parse_trait_methods(): parsing provided method");
                 let (inner_attrs, body) =
                     p.parse_inner_attrs_and_block();
-                let attrs = vec_ng::append(attrs, inner_attrs.as_slice());
+                let attrs = vec::append(attrs, inner_attrs.as_slice());
                 Provided(@ast::Method {
                     ident: ident,
                     attrs: attrs,
@@ -3854,7 +3854,7 @@ impl<'a> Parser<'a> {
 
         let (inner_attrs, body) = self.parse_inner_attrs_and_block();
         let hi = body.span.hi;
-        let attrs = vec_ng::append(attrs, inner_attrs.as_slice());
+        let attrs = vec::append(attrs, inner_attrs.as_slice());
         @ast::Method {
             ident: ident,
             attrs: attrs,
@@ -4086,7 +4086,7 @@ impl<'a> Parser<'a> {
         while self.token != term {
             let mut attrs = self.parse_outer_attributes();
             if first {
-                attrs = vec_ng::append(attrs_remaining.clone(),
+                attrs = vec::append(attrs_remaining.clone(),
                                        attrs.as_slice());
                 first = false;
             }
@@ -4236,7 +4236,7 @@ impl<'a> Parser<'a> {
                                      &path,
                                      id_sp);
         let (inner, next) = p0.parse_inner_attrs_and_next();
-        let mod_attrs = vec_ng::append(outer_attrs, inner.as_slice());
+        let mod_attrs = vec::append(outer_attrs, inner.as_slice());
         let first_item_outer_attrs = next;
         let m0 = p0.parse_mod_items(token::EOF, first_item_outer_attrs);
         {
@@ -4561,7 +4561,7 @@ impl<'a> Parser<'a> {
         match self.token {
             INTERPOLATED(token::NtItem(item)) => {
                 self.bump();
-                let new_attrs = vec_ng::append(attrs, item.attrs.as_slice());
+                let new_attrs = vec::append(attrs, item.attrs.as_slice());
                 return IoviItem(@Item {
                     attrs: new_attrs,
                     ..(*item).clone()
@@ -4989,7 +4989,7 @@ impl<'a> Parser<'a> {
                                   mut extern_mod_allowed: bool,
                                   macros_allowed: bool)
                                   -> ParsedItemsAndViewItems {
-        let mut attrs = vec_ng::append(first_item_attrs,
+        let mut attrs = vec::append(first_item_attrs,
                                        self.parse_outer_attributes()
                                            .as_slice());
         // First, parse view items.
@@ -5071,7 +5071,7 @@ impl<'a> Parser<'a> {
     fn parse_foreign_items(&mut self, first_item_attrs: Vec<Attribute> ,
                            macros_allowed: bool)
         -> ParsedItemsAndViewItems {
-        let mut attrs = vec_ng::append(first_item_attrs,
+        let mut attrs = vec::append(first_item_attrs,
                                        self.parse_outer_attributes()
                                            .as_slice());
         let mut foreign_items = Vec::new();
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index efadea16fe2..43d686dc6cb 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -22,7 +22,7 @@ use std::char;
 use std::fmt;
 use std::local_data;
 use std::path::BytesContainer;
-use std::vec_ng::Vec;
+use std::vec::Vec;
 
 #[allow(non_camel_case_types)]
 #[deriving(Clone, Encodable, Decodable, Eq, Hash, Show)]