Fix ambiguous file target selectors causing an internal error#6875
Merged
phadej merged 1 commit intohaskell:masterfrom Jun 6, 2020
Merged
Conversation
phadej
approved these changes
Jun 5, 2020
lukel97
force-pushed
the
fix-ambiguous-target-selector-internal-error
branch
2 times, most recently
from
66c567f to
f330202
Compare
These should have been returning an error message but instead were causing an internal error because disambiguateTargetSelectors was rendering syntax and rematching on it, which isn't equivalent. Due to the way syntaxForm1File renders, it does not add a FileStatus to its TargetStringFileStatus and so cannot be matched upon again. The fix is to just copy over the FileStatus from the match input. This fixes haskell#6874
lukel97
force-pushed
the
fix-ambiguous-target-selector-internal-error
branch
from
f330202 to
6bef4d3
Compare
Contributor
Author
|
Not sure why the macOS validate job keeps on getting cancelled. Can you retrigger it? |
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
2 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.
These should have been returning an error message but instead were
causing an internal error because disambiguateTargetSelectors was
rendering syntax and rematching on it, which isn't equivalent. Due to
the way syntaxForm1File renders, it does not add a FileStatus to its
TargetStringFileStatus and so cannot be matched upon again.
The fix is to just copy over the FileStatus from the match input.
This fixes #6874