Skip to content

Commit

Permalink
Rollup merge of rust-lang#95390 - nnethercote:allow-doc-comments-in-m…
Browse files Browse the repository at this point in the history
…acros, r=petrochenkov

Ignore doc comments in a declarative macro matcher.

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

r? `@petrochenkov`
  • Loading branch information
Dylan-DPC authored Mar 28, 2022
2 parents 2f5e944 + 9967594 commit 1c8b741
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 7 deletions.
15 changes: 8 additions & 7 deletions compiler/rustc_expand/src/mbe/macro_parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
13 changes: 13 additions & 0 deletions src/test/ui/macros/issue-95267.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// check-pass

// This is a valid macro. Commit 4 in #95159 broke things such that it failed
// with a "missing tokens in macro arguments" error, as reported in #95267.
macro_rules! f {
(
/// ab
) => {};
}

fn main() {
f!();
}

0 comments on commit 1c8b741

Please sign in to comment.