Filter ephemeral marks from planned value #36619
Merged
+99
−8
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
RemoveAll filters marks from a set of cty.PathValueMarks, removing all instances of the remove parameter in all paths. If a path has no remaining marks, it is removed entirely.
PathsWithMark was incorrectly used to try and filter out ephemeral marks, but that doesn't work when a path has multiple marks.
PathsWithMark was adding the same path multiple times if it had multiple extra marks.
jbardin
added
the
1.11-backport
dsa0x
approved these changes
Mar 4, 2025
2 tasks
3 tasks
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.
The filtering of ephemeral marks for the planned value was incorrectly using
PathsWithMark, which only reports paths containing a specific mark or not, and can't account for multiple marks on a particular path. Create amarks.RemoveAllfunction which allows for correct filtering.Fixes #36603
Target Release
v1.11