Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapting to Coq PR #14711: Evd.check_univ_decl returns also the universe binders #30

Conversation

herbelin
Copy link
Contributor

Evd.check_univ_decl now returns also the universe binders by default. We seize the opportunity to propagate them when there are some.

To be merged synchronously with coq/coq#14711. Thanks in advance.

@JasonGross
Copy link
Collaborator

Is this going to make it into the v8.14 branch? If not, we should split off new compat files

@herbelin
Copy link
Contributor Author

It's a priori for 8.15. I'll create a 8.15 file then, if that's the procedure.

@JasonGross
Copy link
Collaborator

It's a bit more complicated than that, since the Makefile also needs to be modified. If you have trouble figuring out how to do it, I'm happy to make the split myself (probably later today).

@JasonGross
Copy link
Collaborator

The commit that did this for 8.14 is at 4e0ebab ; if you're down to make a separate PR that copies all the v814 files to v815 files and makes the corresponding changes in the Makefile, I'd be happy to merge it; otherwise I'll do it myself shortly

@herbelin
Copy link
Contributor Author

Then, that is probably safer if you do it. Thanks.

@JasonGross
Copy link
Collaborator

Created as #31, I'll merge that once the CI passes

@JasonGross
Copy link
Collaborator

#31 merged, could you rebase this on current master and edit the .v815 file instead of the .v814 one?

@herbelin herbelin force-pushed the master+adapt-coq-pr14711-univs-ctx-and-binders-centralized branch from 0bd70ea to 3f2b264 Compare September 13, 2021 15:15
Copy link
Collaborator

@JasonGross JasonGross left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this is still changing the .v814 file, and it should change the .v815 file, now

@herbelin herbelin force-pushed the master+adapt-coq-pr14711-univs-ctx-and-binders-centralized branch from 3f2b264 to 971f000 Compare September 13, 2021 19:06
@herbelin
Copy link
Contributor Author

I pushed, hoping I made it right. Thanks.

@SkySkimmer
Copy link
Contributor

Please merge now

@SkySkimmer
Copy link
Contributor

@JasonGross ping

@JasonGross JasonGross merged commit 1296003 into mit-plv:master Sep 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants