bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

syntax: make OptVec immutable.

Browse source 
This is the first step to replacing OptVec with a new representation:
remove all mutability. Any mutations have to go via `Vec` and then make
to `OptVec`.

Many of the uses of OptVec are unnecessary now that Vec has no-alloc
emptiness (and have been converted to Vec): the only ones that really
need it are the AST and sty's (and so on) where there are a *lot* of
instances of them, and they're (mostly) immutable.
This commit is contained in:
Huon Wilson 2014-03-19 23:16:56 +11:00
parent 7334c11b4b
commit 7785fe1916
15 changed files with 79 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libsyntax/parse/parser.rs
View file

@ -632,7 +632,7 @@ impl<'a> Parser<'a> {
f: |&mut Parser| -> T)
-> OptVec<T> {
let mut first = true;
let mut v = opt_vec::Empty;
let mut v = Vec::new();
while self.token != token::GT
&& self.token != token::BINOP(token::SHR) {
match sep {
@ -644,7 +644,7 @@ impl<'a> Parser<'a> {
}
v.push(f(self));
}
return v;
return opt_vec::from(v);
}
pub fn parse_seq_to_gt<T>(
@ -681,7 +681,7 @@ impl<'a> Parser<'a> {
f: |&mut Parser| -> T)
-> Vec<T> {
let mut first: bool = true;
let mut v: Vec<T> = Vec::new();
let mut v = vec!();
while self.token != *ket {
match sep.sep {
Some(ref t) => {
@ -3437,7 +3437,7 @@ impl<'a> Parser<'a> {
return None;
}
let mut result = opt_vec::Empty;
let mut result = vec!();
loop {
match self.token {
token::LIFETIME(lifetime) => {
@ -3462,7 +3462,7 @@ impl<'a> Parser<'a> {
}
}
return Some(result);
return Some(opt_vec::from(result));
}
// matches typaram = IDENT optbounds ( EQ ty )?