bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #95390 - nnethercote:allow-doc-comments-in-macros, r=petrochenkov

Browse source 
Ignore doc comments in a declarative macro matcher.

Fixes #95267. Reverts to the old behaviour before #95159 introduced a
regression.

r? `@petrochenkov`
This commit is contained in:
Dylan DPC 2022-03-28 16:08:11 +02:00 • committed by GitHub
commit 1c8b7412d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/rustc_expand/src/mbe/macro_parser.rs
View file

@ -516,13 +516,14 @@ impl<'tt> TtParser<'tt> {
}
TokenTree::Token(t) => {
// Doc comments cannot appear in a matcher.
debug_assert!(!matches!(t, Token { kind: DocComment(..), .. }));
// If the token matches, we can just advance the parser. Otherwise, this
// match hash failed, there is nothing to do, and hopefully another item in
// `cur_items` will match.
if token_name_eq(&t, token) {
// If it's a doc comment, we just ignore it and move on to the next tt in
// the matcher. If the token matches, we can just advance the parser.
// Otherwise, this match has failed, there is nothing to do, and hopefully
// another item in `cur_items` will match.
if matches!(t, Token { kind: DocComment(..), .. }) {
item.idx += 1;
self.cur_items.push(item);
} else if token_name_eq(&t, token) {
item.idx += 1;
self.next_items.push(item);
}