diff options
| author | Pierre-Marie Pédrot | 2016-08-21 02:47:12 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2016-08-21 02:47:12 +0200 |
| commit | 73827588102ddffc515f32eb23b0124563109df3 (patch) | |
| tree | f971ce8d44cf671961cc2e1e8b34c8178dbdca64 /theories/Program | |
| parent | 13fb26d615cdb03a4c4841c20b108deab2de60b3 (diff) | |
| parent | 6278ce16ab1b8b65c7d1770d265471f594c8e793 (diff) | |
Merge branch 'v8.6'
Diffstat (limited to 'theories/Program')
| -rw-r--r-- | theories/Program/Equality.v | 5 | ||||
| -rw-r--r-- | theories/Program/Subset.v | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/theories/Program/Equality.v b/theories/Program/Equality.v index a349eb9085..d6f9bb9df0 100644 --- a/theories/Program/Equality.v +++ b/theories/Program/Equality.v @@ -8,7 +8,6 @@ (** Tactics related to (dependent) equality and proof irrelevance. *) -Require Export ProofIrrelevance. Require Export JMeq. Require Import Coq.Program.Tactics. @@ -143,7 +142,7 @@ Ltac pi_eq_proof_hyp p := | [ H : X = Y |- _ ] => match p with | H => fail 2 - | _ => rewrite (proof_irrelevance (X = Y) p H) + | _ => rewrite (UIP _ X Y p H) end | _ => fail " No hypothesis with same type " end @@ -166,7 +165,7 @@ Hint Rewrite <- eq_rect_eq : refl_id. [coerce_* t eq_refl = t]. *) Lemma JMeq_eq_refl {A} (x : A) : JMeq_eq (@JMeq_refl _ x) = eq_refl. -Proof. apply proof_irrelevance. Qed. +Proof. apply UIP. Qed. Lemma UIP_refl_refl A (x : A) : Eqdep.EqdepTheory.UIP_refl A x eq_refl = eq_refl. diff --git a/theories/Program/Subset.v b/theories/Program/Subset.v index c8f37318d1..2a3ec926b2 100644 --- a/theories/Program/Subset.v +++ b/theories/Program/Subset.v @@ -9,6 +9,7 @@ Require Import Coq.Program.Utils. Require Import Coq.Program.Equality. +Require Export ProofIrrelevance. Local Open Scope program_scope. |