bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove extra level of nesting.

Browse source
This commit is contained in:
Mark-Simulacrum 2016-11-12 07:41:47 -07:00
parent 38912ee3d4
commit 2189f573ca
1 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libsyntax/ext/tt/macro_parser.rs
View file

@ -436,9 +436,7 @@ pub fn parse(sess: &ParseSess, rdr: TtReader, ms: &[TokenTree]) -> NamedParseRes
} else { } else {
return Failure(parser.span, token::Eof); return Failure(parser.span, token::Eof);
} }
} else { } else if (!bb_eis.is_empty() && !next_eis.is_empty()) || bb_eis.len() > 1 {
if (!bb_eis.is_empty() && !next_eis.is_empty())
|| bb_eis.len() > 1 {
let nts = bb_eis.iter().map(|ei| match ei.top_elts.get_tt(ei.idx) { let nts = bb_eis.iter().map(|ei| match ei.top_elts.get_tt(ei.idx) {
TokenTree::Token(_, MatchNt(bind, name)) => { TokenTree::Token(_, MatchNt(bind, name)) => {
format!("{} ('{}')", name, bind) format!("{} ('{}')", name, bind)
@ -453,7 +451,7 @@ pub fn parse(sess: &ParseSess, rdr: TtReader, ms: &[TokenTree]) -> NamedParseRes
1 => format!("built-in NTs {} or 1 other option.", nts), 1 => format!("built-in NTs {} or 1 other option.", nts),
n => format!("built-in NTs {} or {} other options.", nts, n), n => format!("built-in NTs {} or {} other options.", nts, n),
} }
)) ));
} else if bb_eis.is_empty() && next_eis.is_empty() { } else if bb_eis.is_empty() && next_eis.is_empty() {
return Failure(parser.span, parser.token); return Failure(parser.span, parser.token);
} else if !next_eis.is_empty() { } else if !next_eis.is_empty() {
@ -473,7 +471,6 @@ pub fn parse(sess: &ParseSess, rdr: TtReader, ms: &[TokenTree]) -> NamedParseRes
} }
cur_eis.push(ei); cur_eis.push(ei);
} }
}
assert!(!cur_eis.is_empty()); assert!(!cur_eis.is_empty());
} }