From cfcd449c4c36c68541c3389878e3262dac5e4746 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Fri, 31 Jul 2015 22:20:25 -0700 Subject: rustc: rename multiple imports in a list --- src/libsyntax/parse/parser.rs | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index e7ab9a73c0f..981d6e1055a 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -573,10 +573,12 @@ impl<'a> Parser<'a> { pub fn parse_path_list_item(&mut self) -> PResult { let lo = self.span.lo; let node = if try!(self.eat_keyword(keywords::SelfValue)) { - ast::PathListMod { id: ast::DUMMY_NODE_ID } + let rename = try!(self.parse_rename()); + ast::PathListMod { id: ast::DUMMY_NODE_ID, rename: rename } } else { let ident = try!(self.parse_ident()); - ast::PathListIdent { name: ident, id: ast::DUMMY_NODE_ID } + let rename = try!(self.parse_rename()); + ast::PathListIdent { name: ident, rename: rename, id: ast::DUMMY_NODE_ID } }; let hi = self.last_span.hi; Ok(spanned(lo, hi, node)) @@ -5104,8 +5106,8 @@ impl<'a> Parser<'a> { -> PResult> { let crate_name = try!(self.parse_ident()); - let (maybe_path, ident) = if try!(self.eat_keyword(keywords::As)) { - (Some(crate_name.name), try!(self.parse_ident())) + let (maybe_path, ident) = if let Some(ident) = try!(self.parse_rename()) { + (Some(crate_name.name), ident) } else { (None, crate_name) }; @@ -5766,10 +5768,16 @@ impl<'a> Parser<'a> { } }).collect() }; + rename_to = try!(self.parse_rename()).unwrap_or(rename_to); + Ok(P(spanned(lo, self.last_span.hi, ViewPathSimple(rename_to, path)))) + } + + fn parse_rename(&mut self) -> PResult> { if try!(self.eat_keyword(keywords::As)) { - rename_to = try!(self.parse_ident()) + self.parse_ident().map(Some) + } else { + Ok(None) } - Ok(P(spanned(lo, self.last_span.hi, ViewPathSimple(rename_to, path)))) } /// Parses a source module as a crate. This is the main -- cgit 1.4.1-3-g733a5