fix: disambiguate prior rule file labels in conflicts - #824
Open
Maksym (maksym-mishchenko) wants to merge 1 commit into
Open
Maksym (maksym-mishchenko) wants to merge 1 commit into
Maksym (maksym-mishchenko) wants to merge 1 commit into
Conversation
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Fix the diagnostic ambiguity left by #820: an actual line break and the literal characters
\ncould display as the same earlier-rule file location. Encode%as%25, LF as%0A, and CR as%0Din that location. Ordinary Windows paths, the current-rule source context, conflict evaluation, and binding statuses stay unchanged.Verification
cargo test --lib rule_conflict_ -- --nocapture(6 passed after three expected pre-fix failures).cargo fmt --all -- --checkandgit diff --checkpassed.