Adapt to coq#pr19611 #45
Merged
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
|
Thanks. I'll take a look at this on Monday, after the holidays in Spain. The reason for hacking Ordered the way it is, is because some of our development that imports the fcsl-pcm repo, requires a specific universe for Ordered. I think the right way to fix this may be to consider adding universe polymorphism related annotations to HB. |
|
Ok, I merged it. |
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.
Due to the way
Orderedis declared (and probably because of universe polymorphism), the unification algorithm "fails" on problems of the formOrdered.sort A = Ordered.sort ?Abecause the universe instances ofOrdered.sortdo not match. This issue is hidden by the canonical structure resolution procedure, but the new algorithm in coq/coq#19611 (purposefully) changes the inferred structure fromAtostructures_eta__canonical__ordtype_Ordered A, which is not unifiable toAand breaks a few things. This PR adds a few annotations to get the correct structure back.N.B. The whole repository compiles with the commented declaration of
Orderedvia HB (also tested on coq-8.19), so I am confused as to why it was necessary to declare it by hand. Restoring the HB declaration would be a much cleaner way to solve the issue, if possible.