diff options
| author | Georges Gonthier | 2019-04-29 23:18:35 +0200 |
|---|---|---|
| committer | Georges Gonthier | 2019-04-30 02:49:38 +0200 |
| commit | c30500ff4db56b6b3ad77dad811e3da766b26e19 (patch) | |
| tree | 6fa067ffb3ce60d5394ab44c961a67a4fa88a5f3 | |
| parent | c3b8865dbf01c857b6b619c620095c0385f66977 (diff) | |
Fix compatibility for #237
- reprove rather than specialize `Some_inj` to allow for redefinition
of `nonPropType` in `mathcomp.ssreflect.ssreflect`
- retarget finmap CI to coq-9995-compatibility
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | mathcomp/ssreflect/ssrfun.v | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3eae6fa..b88a782 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -294,21 +294,29 @@ ci-bigenough-dev: ci-finmap-8.7: extends: .ci-finmap variables: + CONTRIB_URL: "https://github.com/ggonthier/finmap.git" + CONTRIB_VERSION: coq-9995-compatibility COQ_VERSION: "8.7" ci-finmap-8.8: extends: .ci-finmap variables: + CONTRIB_URL: "https://github.com/ggonthier/finmap.git" + CONTRIB_VERSION: coq-9995-compatibility COQ_VERSION: "8.8" ci-finmap-8.9: extends: .ci-finmap variables: + CONTRIB_URL: "https://github.com/ggonthier/finmap.git" + CONTRIB_VERSION: coq-9995-compatibility COQ_VERSION: "8.9" ci-finmap-dev: extends: .ci-finmap variables: + CONTRIB_URL: "https://github.com/ggonthier/finmap.git" + CONTRIB_VERSION: coq-9995-compatibility COQ_VERSION: "dev" ################ diff --git a/mathcomp/ssreflect/ssrfun.v b/mathcomp/ssreflect/ssrfun.v index ed18941..1c1b557 100644 --- a/mathcomp/ssreflect/ssrfun.v +++ b/mathcomp/ssreflect/ssrfun.v @@ -2,4 +2,5 @@ From mathcomp Require Import ssreflect. From Coq Require Export ssrfun. From mathcomp Require Export ssrnotations. -Definition Some_inj {T : nonPropType} := @Some_inj T. +Lemma Some_inj {T : nonPropType} : injective (@Some T). +Proof. by move=> x y []. Qed. |