Skip to content

Commit 7a6db3f

Browse files
committed
Remove DVec from syntax::parse
1 parent 6efa354 commit 7a6db3f

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

src/libsyntax/parse/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,11 @@ mod test {
227227
use super::*;
228228
use std::serialize::Encodable;
229229
use std;
230-
use core::dvec;
231230
use core::str;
232231
use util::testing::*;
233232

234233
#[test] fn to_json_str (val: Encodable<std::json::Encoder>) -> ~str {
235-
let bw = @io::BytesWriter {bytes: dvec::DVec(), pos: 0};
234+
let bw = @io::BytesWriter();
236235
val.encode(~std::json::Encoder(bw as io::Writer));
237236
str::from_bytes(bw.bytes.data)
238237
}

src/libsyntax/parse/parser.rs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ use print::pprust::expr_to_str;
8484
use util::interner::Interner;
8585

8686
use core::cmp;
87-
use core::dvec::DVec;
88-
use core::dvec;
8987
use core::either::{Either, Left, Right};
9088
use core::either;
9189
use core::result::Result;
@@ -1323,11 +1321,11 @@ pub impl Parser {
13231321
}
13241322

13251323
fn parse_all_token_trees() -> ~[token_tree] {
1326-
let tts = DVec();
1324+
let mut tts = ~[];
13271325
while self.token != token::EOF {
13281326
tts.push(self.parse_token_tree());
13291327
}
1330-
tts.get()
1328+
tts
13311329
}
13321330

13331331
fn parse_matchers() -> ~[matcher] {
@@ -3954,7 +3952,7 @@ pub impl Parser {
39543952
VIEW_ITEMS_AND_ITEMS_ALLOWED | IMPORTS_AND_ITEMS_ALLOWED => false
39553953
};
39563954

3957-
let (view_items, items, foreign_items) = (DVec(), DVec(), DVec());
3955+
let mut (view_items, items, foreign_items) = (~[], ~[], ~[]);
39583956
loop {
39593957
match self.parse_item_or_view_item(attrs, items_allowed,
39603958
foreign_items_allowed,
@@ -3986,9 +3984,9 @@ pub impl Parser {
39863984
}
39873985

39883986
{attrs_remaining: attrs,
3989-
view_items: dvec::unwrap(move view_items),
3990-
items: dvec::unwrap(move items),
3991-
foreign_items: dvec::unwrap(move foreign_items)}
3987+
view_items: view_items,
3988+
items: items,
3989+
foreign_items: foreign_items}
39923990
}
39933991

39943992
// Parses a source module as a crate

0 commit comments

Comments
 (0)