merge queue: embarking master (e6a70eb), #10979 and #10988 together #10997
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
This is to comply with haskell/core-libraries-committee#292 We could have achieved the immediate goal by replacing combine in Distribution.Compat.Internal.TempFile with something like combine a [] = a combine a b = case unsnoc a of Nothing -> b Just (_, lastA) | pathSeparator [lastA] -> a ++ b | otherwise -> a ++ [pathSeparatorChar] ++ b but honestly there is no reason to retain openNewBinaryFile implementation at all. Let's just outsource all the work to openBinaryTempFileWithDefaultPermissions from base.
When using a development compiler the compilerId isn't a prefix of the Project Unit Id. This led to a failure to parse the AbiTag. We extend the parsing logic to handle these cases by only removing the common prefix and then any leading '-'s. Resolves #10170
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 pull request has been checked successfully and will be merged soon. 🎉
Branch master (e6a70eb), #10979 and #10988 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #10988.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue
defaultfor merge:#approved-reviews-by >= 2[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#review-threads-unresolved = 0[🛡 GitHub branch protection]check-success = Doctest Cabalcheck-neutral = Doctest Cabalcheck-skipped = Doctest Cabalcheck-success = Meta checkscheck-neutral = Meta checkscheck-skipped = Meta checkscheck-success = docs/readthedocs.org:cabalcheck-neutral = docs/readthedocs.org:cabalcheck-skipped = docs/readthedocs.org:cabalcheck-success = Validate post jobcheck-neutral = Validate post jobcheck-skipped = Validate post jobcheck-success = fourmolucheck-neutral = fourmolucheck-skipped = fourmolucheck-success = hlintcheck-neutral = hlintcheck-skipped = hlintcheck-success = Bootstrap post jobcheck-neutral = Bootstrap post jobcheck-skipped = Bootstrap post jobcheck-success = whitespacecheck-neutral = whitespacecheck-skipped = whitespacecheck-success = Check sdist post jobcheck-neutral = Check sdist post jobcheck-skipped = Check sdist post jobcheck-success = Changelogscheck-neutral = Changelogscheck-skipped = ChangelogsRequired conditions to stay in the queue:
#approved-reviews-by >= 2[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#review-threads-unresolved = 0[🛡 GitHub branch protection]check-success = Doctest Cabalcheck-neutral = Doctest Cabalcheck-skipped = Doctest Cabalcheck-success = Meta checkscheck-neutral = Meta checkscheck-skipped = Meta checkscheck-success = docs/readthedocs.org:cabalcheck-neutral = docs/readthedocs.org:cabalcheck-skipped = docs/readthedocs.org:cabalcheck-success = Validate post jobcheck-neutral = Validate post jobcheck-skipped = Validate post jobcheck-success = fourmolucheck-neutral = fourmolucheck-skipped = fourmolucheck-success = hlintcheck-neutral = hlintcheck-skipped = hlintcheck-success = Bootstrap post jobcheck-neutral = Bootstrap post jobcheck-skipped = Bootstrap post jobcheck-success = whitespacecheck-neutral = whitespacecheck-skipped = whitespacecheck-success = Check sdist post jobcheck-neutral = Check sdist post jobcheck-skipped = Check sdist post jobcheck-success = Changelogscheck-neutral = Changelogscheck-skipped = Changelogs