Skip to content

[obligations] Minor refactoring - #12371

Merged
SkySkimmer merged 4 commits into
rocq-prover:masterfrom
ejgallego:obligations+more_ref
May 21, 2020
Merged

SkySkimmer merged 4 commits into
rocq-prover:masterfrom
ejgallego:obligations+more_ref

Conversation

@ejgallego

Copy link
Copy Markdown
Contributor

Minors bits here and there, mostly self-explanatory.

@ejgallego
ejgallego requested a review from a team as a code owner May 19, 2020 22:11
@ejgallego ejgallego added kind: cleanup Code removal, deprecation, refactorings, etc. part: program labels May 19, 2020
@ejgallego ejgallego added this to the 8.13+beta1 milestone May 19, 2020
@SkySkimmer SkySkimmer added the needs: rebase Should be rebased on the latest master to solve conflicts or have a newer CI run. label May 20, 2020
Comment thread vernac/declare.ml Outdated
let univs = UState.univ_entry ~poly:prg.prg_poly uctx in
let body = prg.prg_reduce body in
let ty = Option.map prg.prg_reduce ty in
let ty = Option.map prg.prg_reduce types in

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

TBH I prefer typ to types as there's only 1
Also why don't we shadow here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Shadowing done, I used types as this is what has been used on the rest of Declare; maybe #12372 would be a good opportunity to discuss a better naming overall.

ejgallego added 2 commits May 20, 2020 14:17
Not necessary anymore after the merge of obligation declaration into
the main path.
Comment thread vernac/obligations.ml Outdated
@SkySkimmer SkySkimmer self-assigned this May 20, 2020
ejgallego added 2 commits May 20, 2020 14:19
This removes a use of internal obligation data `prg_poly` and a couple
of duplicate lines.
@ejgallego
ejgallego force-pushed the obligations+more_ref branch from e1da431 to e0dc8cb Compare May 20, 2020 12:20
@coqbot coqbot removed the needs: rebase Should be rebased on the latest master to solve conflicts or have a newer CI run. label May 20, 2020
@ejgallego

Copy link
Copy Markdown
Contributor Author

Failure is spurious, windows worker is full.

@SkySkimmer
SkySkimmer merged commit 90389df into rocq-prover:master May 21, 2020
@ejgallego
ejgallego deleted the obligations+more_ref branch May 21, 2020 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind: cleanup Code removal, deprecation, refactorings, etc. part: program

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants