Fix invalid tag closing when leaving expansion "original code" #148213
+58
−1
Conversation
This file contains hidden or 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
rustbot
added
S-waiting-on-review
Collaborator
|
fmease
reviewed
Oct 31, 2025
Member
There was a problem hiding this comment.
(Currently reading through PR #146992 commit by commit to catch up.)
Quick side note: ElementStackClassStack is not actually a stack, it's a tree!
Reading through this for the first time that's a bit confusing (moreso the resulting method names like (was renamed in a later commit)).enter_stack don't help me form an intuition (granted, it's 2AM for me rn and I'm only skimming the code)
Member
Author
There was a problem hiding this comment.
Nah, it used to be a tree, it's now a stack (always one child). :3
Member
Author
yotamofek
reviewed
Nov 6, 2025
Contributor
|
Looks good! |
Member
Author
|
Thanks for the review! @bors r=yotamofek rollup |
Collaborator
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 6, 2025
…on, r=yotamofek Fix invalid tag closing when leaving expansion "original code" Fixes rust-lang#148184. Problem was that in case an element inside the expansion's "original" element was not closed, this element would get its `pending_exit` field set to `true`, removing it when the next non-mergeable item gets pushed instead of being put inside it, and then next `exit_elem` would try to exit an empty class queue. r? `@notriddle`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Nov 6, 2025
…on, r=yotamofek Fix invalid tag closing when leaving expansion "original code" Fixes rust-lang#148184. Problem was that in case an element inside the expansion's "original" element was not closed, this element would get its `pending_exit` field set to `true`, removing it when the next non-mergeable item gets pushed instead of being put inside it, and then next `exit_elem` would try to exit an empty class queue. r? ``@notriddle``
This was referenced Nov 6, 2025
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Nov 6, 2025
…on, r=yotamofek Fix invalid tag closing when leaving expansion "original code" Fixes rust-lang#148184. Problem was that in case an element inside the expansion's "original" element was not closed, this element would get its `pending_exit` field set to `true`, removing it when the next non-mergeable item gets pushed instead of being put inside it, and then next `exit_elem` would try to exit an empty class queue. r? ````@notriddle````
bors
added a commit
that referenced
this pull request
Nov 6, 2025
Rollup of 7 pull requests Successful merges: - #146861 (add extend_front to VecDeque with specialization like extend) - #148213 (Fix invalid tag closing when leaving expansion "original code") - #148292 (Un-shadow object bound candidate in `NormalizesTo` goal if self_ty is trait object) - #148528 (run-make tests: use edition 2024) - #148554 (Add regression test for issue 148542) - #148561 (Fix ICE from async closure variance) - #148563 (rustdoc-search: remove broken index special case) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Nov 6, 2025
Rollup merge of #148213 - GuillaumeGomez:fix-exit-of-expansion, r=yotamofek Fix invalid tag closing when leaving expansion "original code" Fixes #148184. Problem was that in case an element inside the expansion's "original" element was not closed, this element would get its `pending_exit` field set to `true`, removing it when the next non-mergeable item gets pushed instead of being put inside it, and then next `exit_elem` would try to exit an empty class queue. r? ```@notriddle```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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 #148184.
Problem was that in case an element inside the expansion's "original" element was not closed, this element would get its
pending_exitfield set totrue, removing it when the next non-mergeable item gets pushed instead of being put inside it, and then nextexit_elemwould try to exit an empty class queue.r? @notriddle