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

rollup merge of #20266: nick29581/dxr-use

Browse source 
r? @huonw
This commit is contained in:
Alex Crichton 2014-12-29 16:36:32 -08:00
commit 066be2a72d
4 changed files with 70 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5977,7 +5977,7 @@ impl<'a> Parser<'a> {
}
/// Matches view_path : MOD? IDENT EQ non_global_path
/// Matches view_path : MOD? non_global_path as IDENT
/// | MOD? non_global_path MOD_SEP LBRACE RBRACE
/// | MOD? non_global_path MOD_SEP LBRACE ident_seq RBRACE
/// | MOD? non_global_path MOD_SEP STAR
@ -6089,7 +6089,7 @@ impl<'a> Parser<'a> {
}
let mut rename_to = path[path.len() - 1u];
let path = ast::Path {
span: mk_sp(lo, self.span.hi),
span: mk_sp(lo, self.last_span.hi),
global: false,
segments: path.into_iter().map(|identifier| {
ast::PathSegment {
@ -6101,7 +6101,8 @@ impl<'a> Parser<'a> {
if self.eat_keyword(keywords::As) {
rename_to = self.parse_ident()
}
P(spanned(lo, self.last_span.hi,
P(spanned(lo,
self.last_span.hi,
ViewPathSimple(rename_to, path, ast::DUMMY_NODE_ID)))
}