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.

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

expand: Stop normalizing NtIdents before passing them to built-in macros #77275

Merged
merged 2 commits into from
Sep 29, 2020

Conversation

petrochenkov
Copy link
Contributor

Built-in macros should be able to deal with NtIdents in the input by themselves like any other parser code.

You can't imagine how bad mutable AST visitors are, especially if they are modifying tokens.
This is one step towards removing token visiting from the visitor infrastructure (#77271 also works in this direction.)

@rust-highfive
Copy link
Collaborator

r? @varkor

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 27, 2020
@varkor
Copy link
Member

varkor commented Sep 27, 2020

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Sep 27, 2020

📌 Commit 3b27799 has been approved by varkor

@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 Sep 27, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request Sep 28, 2020
expand: Stop normalizing `NtIdent`s before passing them to built-in macros

Built-in macros should be able to deal with `NtIdents` in the input by themselves like any other parser code.

You can't imagine how bad mutable AST visitors are, *especially* if they are modifying tokens.
This is one step towards removing token visiting from the visitor infrastructure (rust-lang#77271 also works in this direction.)
@RalfJung
Copy link
Member

I think this broke the asm! macro, maybe? #77297 (comment)
I cannot see anything else in that rollup that would have such an effect...

@bors r- rollup=iffy

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 28, 2020
@petrochenkov
Copy link
Contributor Author

Yep, this PR is to blame.

…-in macros

This was a big hack, and built-in macros should be able to deal with `NtIdents` in the input by themselves like any other parser code.
@petrochenkov
Copy link
Contributor Author

@bors r=varkor

@bors
Copy link
Contributor

bors commented Sep 28, 2020

📌 Commit 4a4a7f8 has been approved by varkor

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 28, 2020
@bors
Copy link
Contributor

bors commented Sep 28, 2020

⌛ Testing commit 4a4a7f8 with merge a0aa59c155b4edde00742e095cdfb552cdf200f9...

@bors
Copy link
Contributor

bors commented Sep 29, 2020

💥 Test timed out

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

@bors retry

@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 Sep 29, 2020
@bors
Copy link
Contributor

bors commented Sep 29, 2020

⌛ Testing commit 4a4a7f8 with merge 26373fb...

@bors
Copy link
Contributor

bors commented Sep 29, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: varkor
Pushing 26373fb to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 29, 2020
@bors bors merged commit 26373fb into rust-lang:master Sep 29, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants