diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-06-05 11:00:22 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-06-06 14:04:02 +0300 |
| commit | 4c5d773b4d529c6263f682513ea34ce644a8179b (patch) | |
| tree | 2d207a75d803063e4ee7a87ca55fb68af3bfe088 /src/libsyntax/ext | |
| parent | 5e693531ffa55cfb0cececdf5d7203a6d400e828 (diff) | |
| download | rust-4c5d773b4d529c6263f682513ea34ce644a8179b.tar.gz rust-4c5d773b4d529c6263f682513ea34ce644a8179b.zip | |
syntax: Remove duplicate span from `token::Lifetime`
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/tt/macro_parser.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 7127acabb44..f93b548c501 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -431,8 +431,8 @@ pub fn parse_failure_msg(tok: TokenKind) -> String { fn token_name_eq(t1: &TokenKind, t2: &TokenKind) -> bool { if let (Some((id1, is_raw1)), Some((id2, is_raw2))) = (t1.ident(), t2.ident()) { id1.name == id2.name && is_raw1 == is_raw2 - } else if let (Some(id1), Some(id2)) = (t1.lifetime(), t2.lifetime()) { - id1.name == id2.name + } else if let (Some(name1), Some(name2)) = (t1.lifetime_name(), t2.lifetime_name()) { + name1 == name2 } else { *t1 == *t2 } |