Adapt to coq/coq#15789#1469
Merged
benediktahrens merged 5 commits intoUniMath:masterfrom Mar 11, 2022
Merged
Conversation
Member
|
Dear @proux01 , thanks a lot for providing this fix. It seems that the right course of action would be to
|
3 tasks
Contributor
Author
|
Thanks @benediktahrens for your quick answer, that looks good to me. |
benediktahrens
approved these changes
Mar 11, 2022
Member
benediktahrens
left a comment
There was a problem hiding this comment.
I just suggest to add pointers to the PR (better: the issue about the PR) in the modified places.
Contributor
Author
|
Thanks |
Contributor
Author
|
CI green |
Contributor
Author
|
Thanks! |
Member
|
@proux01 : Thanks to you! We very much appreciate the efforts by you and the whole Coq Development Team to keep UniMath compatible with Coq. |
Skantz
pushed a commit
to Skantz/UniMath
that referenced
this pull request
Nov 12, 2022
Skantz
pushed a commit
to Skantz/UniMath
that referenced
this pull request
Nov 12, 2022
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.
Adapt to rocq-prover/rocq#15789
The upstream PR generalizes coercions by removing the uniform inheritance conditions.
Unimath has ambiguous coercion paths that were inocuous before because some of them did not satisfy the uniform inheritance condition, hence were never applied. Now that they do, a few conflict appear. I make here a quick fix, It's probably possible to get a nicer fix, but not knowing the library, I'm unable to do it. Anyway, the change is backward compatible and appart a few more not nice looking lines, it doesn't change anything.