diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-05-16 08:18:34 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-16 08:18:34 -0600 |
| commit | 6b4f3a73d2d89caff0eda5e9456929c93f13723f (patch) | |
| tree | 04f376fade758c406ed30fc0fcf11862b9bdb4cb /src/libsyntax | |
| parent | 4bf04704c3cf9d30307143183a07915b37664146 (diff) | |
| parent | 9f4e1e10a48f54738b373f4be3667d8f1a8cc2c7 (diff) | |
| download | rust-6b4f3a73d2d89caff0eda5e9456929c93f13723f.tar.gz rust-6b4f3a73d2d89caff0eda5e9456929c93f13723f.zip | |
Rollup merge of #42005 - jseyfried:fix_macro_regression, r=nrc
Fix regression in `macro_rules!` name matching Fixes #41803. r? @nrc
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/tt/macro_parser.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index eb0b7c29f8d..780b7ec8c2a 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -267,11 +267,12 @@ pub fn parse_failure_msg(tok: Token) -> String { /// Perform a token equality check, ignoring syntax context (that is, an unhygienic comparison) fn token_name_eq(t1 : &Token, t2 : &Token) -> bool { - match (t1,t2) { - (&token::Ident(id1),&token::Ident(id2)) - | (&token::Lifetime(id1),&token::Lifetime(id2)) => - id1.name == id2.name, - _ => *t1 == *t2 + if let (Some(id1), Some(id2)) = (t1.ident(), t2.ident()) { + id1.name == id2.name + } else if let (&token::Lifetime(id1), &token::Lifetime(id2)) = (t1, t2) { + id1.name == id2.name + } else { + *t1 == *t2 } } |