Skip to content

Adapt to https://github.com/coq/coq/pull/18590 #1055

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

Merged
merged 1 commit into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions erasure/theories/EWcbvEvalCstrsAsBlocksFixLambdaInd.v
Original file line number Diff line number Diff line change
Expand Up @@ -138,18 +138,15 @@ Class Qconst Σ (Q : nat -> term -> Type) := qconst :
end.
#[export] Hint Mode Qconst - ! : typeclass_instances.

Set Warnings "-future-coercion-class-field".
Class Qpreserves {etfl : ETermFlags} (Q : nat -> term -> Type) Σ :=
{ qpres_qpres :> Qpres Q;
qpres_qcons :> Qconst Σ Q;
qpres_qapp :> Qapp Q;
qpres_qcase :> Qcase Q;
qpres_qproj :> Qproj Q;
qpres_qsubst :> Qsubst Q;
qpres_qfix :> Qfix Q;
qpres_qcofix :> Qcofix Q }.
Set Warnings "+future-coercion-class-field".

{ qpres_qpres :: Qpres Q;
qpres_qcons :: Qconst Σ Q;
qpres_qapp :: Qapp Q;
qpres_qcase :: Qcase Q;
qpres_qproj :: Qproj Q;
qpres_qsubst :: Qsubst Q;
qpres_qfix :: Qfix Q;
qpres_qcofix :: Qcofix Q }.

Lemma eval_beta_inv {wfl : WcbvFlags} Σ t a v :
isLambda t ->
Expand Down
18 changes: 8 additions & 10 deletions erasure/theories/EWcbvEvalCstrsAsBlocksInd.v
Original file line number Diff line number Diff line change
Expand Up @@ -138,17 +138,15 @@ Class Qconst Σ (Q : nat -> term -> Type) := qconst :
end.
#[export] Hint Mode Qconst - ! : typeclass_instances.

Set Warnings "-future-coercion-class-field".
Class Qpreserves {etfl : ETermFlags} (Q : nat -> term -> Type) Σ :=
{ qpres_qpres :> Qpres Q;
qpres_qcons :> Qconst Σ Q;
qpres_qapp :> Qapp Q;
qpres_qcase :> Qcase Q;
qpres_qproj :> Qproj Q;
qpres_qsubst :> Qsubst Q;
qpres_qfix :> Qfix Q;
qpres_qcofix :> Qcofix Q }.
Set Warnings "+future-coercion-class-field".
{ qpres_qpres :: Qpres Q;
qpres_qcons :: Qconst Σ Q;
qpres_qapp :: Qapp Q;
qpres_qcase :: Qcase Q;
qpres_qproj :: Qproj Q;
qpres_qsubst :: Qsubst Q;
qpres_qfix :: Qfix Q;
qpres_qcofix :: Qcofix Q }.

Lemma eval_preserve_mkApps_ind :
∀ (wfl : WcbvFlags), with_constructor_as_block = true -> forall {efl : EEnvFlags} (Σ : global_declarations)
Expand Down
18 changes: 8 additions & 10 deletions erasure/theories/EWcbvEvalEtaInd.v
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,15 @@ Class Qconst Σ (Q : nat -> term -> Type) := qconst :
end.
#[export] Hint Mode Qconst - ! : typeclass_instances.

Set Warnings "-future-coercion-class-field".
Class Qpreserves {etfl : ETermFlags} (Q : nat -> term -> Type) Σ :=
{ qpres_qpres :> Qpres Q;
qpres_qcons :> Qconst Σ Q;
qpres_qapp :> Qapp Q;
qpres_qcase :> Qcase Q;
qpres_qproj :> Qproj Q;
qpres_qsubst :> Qsubst Q;
qpres_qfix :> Qfix Q;
qpres_qcofix :> Qcofix Q }.
Set Warnings "+future-coercion-class-field".
{ qpres_qpres :: Qpres Q;
qpres_qcons :: Qconst Σ Q;
qpres_qapp :: Qapp Q;
qpres_qcase :: Qcase Q;
qpres_qproj :: Qproj Q;
qpres_qsubst :: Qsubst Q;
qpres_qfix :: Qfix Q;
qpres_qcofix :: Qcofix Q }.

Lemma eval_preserve_mkApps_ind :
∀ (wfl : WcbvFlags), with_constructor_as_block = false -> forall {efl : EEnvFlags} (Σ : global_declarations)
Expand Down
3 changes: 1 addition & 2 deletions test-suite/hott_example.v
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
Set Warnings "-future-coercion-class-field".
Set Universe Polymorphism.

(* Basic notations *)
Expand Down Expand Up @@ -402,7 +401,7 @@ Coercion e_inv : IsEquiv >-> Funclass.
(** A class that includes all the data of an adjoint equivalence. *)
Class Equiv A B := BuildEquiv {
e_fun : A -> B ;
e_isequiv :> IsEquiv e_fun
e_isequiv :: IsEquiv e_fun
}.

Coercion e_fun : Equiv >-> Funclass.
Expand Down