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

Remove Nonterminal::NtTT. #95301

Merged
merged 1 commit into from
Mar 28, 2022
Merged

Remove Nonterminal::NtTT. #95301

merged 1 commit into from
Mar 28, 2022

Conversation

nnethercote
Copy link
Contributor

It's only needed for macro expansion, not as a general element in the
AST. This commit removes it, adds NtOrTt for the parser and macro
expansion cases, and renames the variants in NamedMatch to better
match the new type.

r? @petrochenkov

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 25, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2022
@nnethercote
Copy link
Contributor Author

Thanks for the idea!

@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 25, 2022
It's only needed for macro expansion, not as a general element in the
AST. This commit removes it, adds `NtOrTt` for the parser and macro
expansion cases, and renames the variants in `NamedMatch` to better
match the new type.
@nnethercote
Copy link
Contributor Author

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 27, 2022
@bors
Copy link
Contributor

bors commented Mar 27, 2022

⌛ Trying commit 364b908 with merge b02efedc33c45b1ba76708f34fd5c8446828d9da...

@bors
Copy link
Contributor

bors commented Mar 28, 2022

☀️ Try build successful - checks-actions
Build commit: b02efedc33c45b1ba76708f34fd5c8446828d9da (b02efedc33c45b1ba76708f34fd5c8446828d9da)

@rust-timer
Copy link
Collaborator

Queued b02efedc33c45b1ba76708f34fd5c8446828d9da with parent ab0c2e1, future comparison URL.

@petrochenkov petrochenkov added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 28, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b02efedc33c45b1ba76708f34fd5c8446828d9da): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR led to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 28, 2022
@nnethercote
Copy link
Contributor Author

Performance effects are negligible, as expected.

@bors rollup=always

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Mar 28, 2022

📌 Commit 364b908 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
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 28, 2022
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 ae037a8 into rust-lang:master Mar 28, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 28, 2022
@nnethercote nnethercote deleted the rm-NtTT branch March 28, 2022 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

6 participants