Revert "Rollup merge of #87779 - Aaron1011:stmt-ast-id, r=petrochenkov" #87969
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
…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.
|
r? @cjgillot (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ |
|
📌 Commit cfc3fee has been approved by |
bors
added
S-waiting-on-bors
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.
This was referenced Aug 13, 2021
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
|
cc #87779 (the reverted PR) For some reason I also thought this PR had a regression test. |
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.
Fixes #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.