refactor: simplify MergeInto patch op #999
Merged
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
|
I thought through it a bit, and I think the easiest way to handle the |
woodruffw
added a commit
that referenced
this pull request
Jul 1, 2025
This was referenced Jul 1, 2025
mostafa
added a commit
to mostafa/zizmor
that referenced
this pull request
Jul 1, 2025
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.
This simplifies the
MergeIntopatch op a bit by reducing its scope and eliminating the need for any special-case top-level handling. It leaves thefoo:i.e. empty mapping body case unimplemented, although now it'll fail with a more contextually appropriate error.I also went ahead and removed two tests that appear to be duplicates of other tests, despite their names:
test_merge_into_with_shell_keytest_merge_into_key_reuse_with_different_value_types