Remove special case for statement NodeId assignment
#87779
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @oli-obk (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
petrochenkov
reviewed
Aug 5, 2021
|
r=me with one more cleanup (#87779 (comment)). |
petrochenkov
added
S-waiting-on-author
|
@bors r=petrochenkov |
|
📌 Commit 1a7e56c has been approved by |
bors
added
S-waiting-on-bors
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Aug 6, 2021
Remove special case for statement `NodeId` assignment We now let `noop_flat_map_stmt` assign `NodeId`s (via `visit_id`), just as we do for other AST nodes.
|
Failed in rollup: #87806 (comment) |
bors
added
S-waiting-on-author
We now let `noop_flat_map_stmt` assign `NodeId`s (via `visit_id`), just as we do for other AST nodes.
|
@bors r=petrochenkov |
|
📌 Commit a35d7f2 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 6, 2021
Rollup of 7 pull requests Successful merges: - rust-lang#85807 (bootstrap: Disable initial-exec TLS model on powerpc) - rust-lang#87761 (Fix overflow in rustc happening if the `err_count()` is reduced in a stage.) - rust-lang#87775 (Add hint for unresolved associated trait items if the trait has a single item) - rust-lang#87779 (Remove special case for statement `NodeId` assignment) - rust-lang#87787 (Use `C-unwind` ABI for `__rust_start_panic` in `panic_abort`) - rust-lang#87809 (Fix typo in the ptr documentation) - rust-lang#87816 (Sync rustc_codegen_cranelift) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Aaron1011
added a commit
to Aaron1011/rust
that referenced
this pull request
Aug 12, 2021
…trochenkov" Fixes rust-lang#87877 This change interacts badly with `noop_flat_map_stmt`, which synthesizes multiple statements with the same `NodeId`. I'm working on a better fix that will still allow us to remove this special case. For now, let's revert the change to fix the ICE. This reverts commit a4262cc, reversing changes made to 8ee962f.
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Aug 13, 2021
…enkov Revert "Rollup merge of rust-lang#87779 - Aaron1011:stmt-ast-id, r=petrochenkov" Fixes rust-lang#87877 This change interacts badly with `noop_flat_map_stmt`, which synthesizes multiple statements with the same `NodeId`. I'm working on a better fix that will still allow us to remove this special case. For now, let's revert the change to fix the ICE. This reverts commit a4262cc, reversing changes made to 8ee962f.
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Aug 13, 2021
…enkov Revert "Rollup merge of rust-lang#87779 - Aaron1011:stmt-ast-id, r=petrochenkov" Fixes rust-lang#87877 This change interacts badly with `noop_flat_map_stmt`, which synthesizes multiple statements with the same `NodeId`. I'm working on a better fix that will still allow us to remove this special case. For now, let's revert the change to fix the ICE. This reverts commit a4262cc, reversing changes made to 8ee962f.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 13, 2021
…laumeGomez Rollup of 4 pull requests Successful merges: - rust-lang#87795 (Avoid ICE caused by suggestion) - rust-lang#87966 (Fix `command-create-pidfd` test inside unprivileged Docker containers) - rust-lang#87969 (Revert "Rollup merge of rust-lang#87779 - Aaron1011:stmt-ast-id, r=petrochenkov") - rust-lang#88005 (Add rustdoc GUI test for headers) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This was referenced Aug 26, 2021
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Sep 2, 2021
expand: Treat more macro calls as statement macro calls This PR implements the suggestion from rust-lang#87981 (comment) and treats fn-like macro calls inside `StmtKind::Item` and `StmtKind::Semi` as statement macro calls, which is consistent with treatment of attribute invocations in the same positions and with token-based macro expansion model in general. This also allows to remove a special case in `NodeId` assignment (previously tried in rust-lang#87779), and to use statement `NodeId`s for linting (`assign_id!`). r? `@Aaron1011`
m-ou-se
added a commit
to m-ou-se/rust
that referenced
this pull request
Sep 2, 2021
expand: Treat more macro calls as statement macro calls This PR implements the suggestion from rust-lang#87981 (comment) and treats fn-like macro calls inside `StmtKind::Item` and `StmtKind::Semi` as statement macro calls, which is consistent with treatment of attribute invocations in the same positions and with token-based macro expansion model in general. This also allows to remove a special case in `NodeId` assignment (previously tried in rust-lang#87779), and to use statement `NodeId`s for linting (`assign_id!`). r? `@Aaron1011`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 3, 2021
expand: Treat more macro calls as statement macro calls This PR implements the suggestion from rust-lang#87981 (comment) and treats fn-like macro calls inside `StmtKind::Item` and `StmtKind::Semi` as statement macro calls, which is consistent with treatment of attribute invocations in the same positions and with token-based macro expansion model in general. This also allows to remove a special case in `NodeId` assignment (previously tried in rust-lang#87779), and to use statement `NodeId`s for linting (`assign_id!`). r? `@Aaron1011`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We now let
noop_flat_map_stmtassignNodeIds (viavisit_id),just as we do for other AST nodes.