Merge branch 'coqbump' into 'master'

bump to Coq 8.20

See merge request !67

.gitlab-ci.yml

@@ -48,10 +48,10 @@ build-coq.dev:
     OCAML: "ocaml-base-compiler.4.14.0" # for faster rebuilds
     OPAM_PINS: "coq version dev"
 
-build-coq.8.19.0:
+build-coq.8.20.0:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.19.0"
+    OPAM_PINS: "coq version 8.20.0"
     DENY_WARNINGS: "1"
     MANGLE_NAMES: "1"
     # Coq bench needs an opam package
@@ -60,18 +60,18 @@ build-coq.8.19.0:
   - fp-timing
 
 # Separate MR job that does not run on fp-timing.
-build-coq.8.19.0-mr:
+build-coq.8.20.0-mr:
   <<: *template
   <<: *only_mr
   variables:
-    OPAM_PINS: "coq version 8.19.0"
+    OPAM_PINS: "coq version 8.20.0"
     MANGLE_NAMES: "1"
     DENY_WARNINGS: "1"
 
 trigger-iris.timing:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.19.0   git+https://gitlab.mpi-sws.org/$IRIS_REPO#$IRIS_REV"
+    OPAM_PINS: "coq version 8.20.0   git+https://gitlab.mpi-sws.org/$IRIS_REPO#$IRIS_REV"
   tags:
   - fp-timing
   only:

README.md

@@ -6,7 +6,7 @@ Some example verification demonstrating the use of Iris.
 
 This version is known to compile with:
 
- - Coq 8.19.0
+ - Coq 8.20.0
  - A development version of [Iris](https://gitlab.mpi-sws.org/iris/iris)
  - A development version of [Autosubst](https://github.com/coq-community/autosubst)
 

_CoqProject

@@ -4,6 +4,8 @@
 # Cannot use non-canonical projections as it causes massive unification failures
 # (https://github.com/coq/coq/issues/6294).
 -arg -w -arg -redundant-canonical-projection
+# Warning seems incorrect, see https://gitlab.mpi-sws.org/iris/stdpp/-/issues/216
+-arg -w -arg -notation-incompatible-prefix
 
 theories/barrier/proof.v
 theories/barrier/specification.v

theories/logrel/F_mu_ref_conc/typing.v

@@ -147,7 +147,7 @@ Proof.
     match goal with H : context[_ → _ ⊢ₜ _ : _] |- _ => rename H into IH end.
     specialize (IH
       (subst (ren (+1)) <$> Γ1) (subst (ren (+1)) <$> Γ2) (subst (ren (+1)) <$> ξ)).
-    rewrite ?map_length in IH.
+    rewrite ?length_map in IH.
     repeat rewrite fmap_app. apply IH.
     by repeat rewrite fmap_app.
   - econstructor; eauto.
@@ -155,7 +155,7 @@ Proof.
     match goal with H : context[_ → _ ⊢ₜ _ : TExist ?t] |- _ => rename t into τ end.
     specialize (IH
       (τ :: (subst (ren (+1)) <$> Γ1)) (subst (ren (+1)) <$> Γ2) (subst (ren (+1)) <$> ξ)).
-    asimpl in IH. rewrite ?map_length in IH.
+    asimpl in IH. rewrite ?length_map in IH.
     repeat rewrite fmap_app. apply IH.
     by repeat rewrite fmap_app.
 Qed.