Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore doc comments in a declarative macro matcher. #95390

Merged
merged 1 commit into from
Mar 28, 2022
Merged

Ignore doc comments in a declarative macro matcher. #95390

merged 1 commit into from
Mar 28, 2022

Conversation

nnethercote
Copy link
Contributor

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

r? @petrochenkov

@nnethercote
Ignore doc comments in a declarative macro matcher.
9967594 
Fixes rust-lang#95267. Reverts to the old behaviour before rust-lang#95159 introduced a
regression.
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 27, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 27, 2022
@nnethercote
Copy link
Contributor Author

nnethercote commented Mar 28, 2022 •
edited
Loading

@bors p=1

@petrochenkov
Copy link
Contributor

Doc comment tokens being ignored is obviously a bug, and #95159 fixed it.
Unfortunately the breakage from that bugfix appears to be too large, so let's revert it for now.
Maybe it can be fixed later with a compatibility lint, transition period, etc.
@bors r+

@bors
Copy link
Contributor

bors commented Mar 28, 2022

📌 Commit 9967594 has been approved by petrochenkov

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 28, 2022
@lqd
Copy link
Member

lqd commented Mar 28, 2022

@bors p=1

@Dylan-DPC Dylan-DPC mentioned this pull request Mar 28, 2022
Merged
@paolobarbolini paolobarbolini mentioned this pull request Mar 28, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 28, 2022
@bors
Auto merge of rust-lang#95403 - Dylan-DPC:rollup-9on30mg, r=Dylan-DPC
600ec28 
Rollup of 6 pull requests

Successful merges:

 - rust-lang#95301 (Remove `Nonterminal::NtTT`.)
 - rust-lang#95314 (Tell users that `||` operators are not currently supported in let chain expressions)
 - rust-lang#95350 (resolve: Simplify some diagnostic code to avoid an ICE)
 - rust-lang#95370 ([bootstrap] Don't print `Suite not skipped` unless `--verbose` is set)
 - rust-lang#95390 (Ignore doc comments in a declarative macro matcher.)
 - rust-lang#95401 (Remove duplicated and unused test files)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 1c8b741 into rust-lang:master Mar 28, 2022
@bors
Copy link
Contributor

bors commented Mar 28, 2022

⌛ Testing commit 9967594 with merge 600ec28...

@rustbot rustbot added this to the 1.61.0 milestone Mar 28, 2022
@nnethercote nnethercote deleted the allow-doc-comments-in-macros branch March 28, 2022 21:28
@zjp-CN zjp-CN mentioned this pull request Mar 29, 2022
Closed
@mgrachev mgrachev mentioned this pull request Mar 29, 2022
Merged
10 tasks
@est31 est31 mentioned this pull request Jun 6, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.61.0
Development

Successfully merging this pull request may close these issues.

Failed to compile ring under nightly Rust (1.61.0, 9f4dc0b4d 2022-03-23)
6 participants
@nnethercote @petrochenkov @bors @lqd @rust-highfive @rustbot