bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Merge remote-tracking branch 'mozilla/incoming' into issue-5910-dyna-freeze

Browse source
This commit is contained in:
Niko Matsakis 2013-05-06 09:00:50 -04:00
commit 6c0c3a44bd
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax/parse/attr.rs
View file

@ -156,7 +156,7 @@ impl parser_attr for Parser {
@spanned(lo, hi, ast::meta_list(name, inner_items)) @spanned(lo, hi, ast::meta_list(name, inner_items))
} }
_ => { _ => {
let hi = self.span.hi; let hi = self.last_span.hi;
@spanned(lo, hi, ast::meta_word(name)) @spanned(lo, hi, ast::meta_word(name))
} }
} }

2
src/libsyntax/parse/common.rs
View file

@ -122,7 +122,7 @@ pub impl Parser {
fn parse_path_list_ident(&self) -> ast::path_list_ident { fn parse_path_list_ident(&self) -> ast::path_list_ident {
let lo = self.span.lo; let lo = self.span.lo;
let ident = self.parse_ident(); let ident = self.parse_ident();
let hi = self.span.hi; let hi = self.last_span.hi;
spanned(lo, hi, ast::path_list_ident_ { name: ident, spanned(lo, hi, ast::path_list_ident_ { name: ident,
id: self.get_id() }) id: self.get_id() })
} }

4
src/libsyntax/parse/mod.rs
View file

@ -591,7 +591,7 @@ mod test {
types: ~[]}, types: ~[]},
None // no idea None // no idea
), ),
span: sp(0,3)}, // really? span: sp(0,1)},
id: 4 // fixme id: 4 // fixme
}) })
} }
@ -628,7 +628,7 @@ mod test {
types: ~[]}, types: ~[]},
None // no idea None // no idea
), ),
span: sp(6,9)}, // bleah. span: sp(6,7)},
id: 4 // fixme id: 4 // fixme
}], }],
output: @ast::Ty{id:5, // fixme output: @ast::Ty{id:5, // fixme

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

@ -2444,7 +2444,7 @@ pub impl Parser {
} }
} }
} }
hi = self.span.hi; hi = self.last_span.hi;
} }
} }
@ast::pat { id: self.get_id(), node: pat, span: mk_sp(lo, hi) } @ast::pat { id: self.get_id(), node: pat, span: mk_sp(lo, hi) }
@ -4307,7 +4307,7 @@ pub impl Parser {
rp: None, rp: None,
types: ~[] }; types: ~[] };
return @spanned(lo, return @spanned(lo,
self.span.hi, self.last_span.hi,
view_path_simple(last, path, self.get_id())); view_path_simple(last, path, self.get_id()));
} }