Merge branch 'master' of https://gitlab.mpi-sws.org/iris/actris

.gitlab-ci.yml

@@ -27,10 +27,10 @@ variables:
 
 ## Build jobs
 
-build-coq.8.11.2:
+build-coq.8.12.0:
   <<: *template
   variables:
-    OPAM_PINS: "coq version 8.11.2"
+    OPAM_PINS: "coq version 8.12.0"
     DENY_WARNINGS: "1"
 
 build-iris.dev:

README.md

@@ -7,7 +7,7 @@ at POPL'20.
 
 It has been built and tested with the following dependencies
 
- - Coq 8.11.2
+ - Coq 8.12.0
  - The version of Iris in the [opam file](opam)
 
 In order to build, install the above dependencies and then run

opam

@@ -9,5 +9,5 @@ build: [make "-j%{jobs}%"]
 install: [make "install"]
 remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/actris" ]
 depends: [
-  "coq-iris" { (= "dev.2020-09-03.1.7dd1b9af") | (= "dev") }
+  "coq-iris" { (= "dev.2020-09-15.3.986a8883") | (= "dev") }
 ]

theories/logrel/examples/double.v

@@ -113,10 +113,10 @@ Section double.
     - iIntros (v1 v2) "[[[H1 Hγ]|H1] [[H2 Hγ']|H2]] !>".
       + by iDestruct (own_valid_2 with "Hγ Hγ'") as %[].
       + iDestruct "H2" as (v2') "(_&H1'&HP)".
-        iDestruct (own_valid_2 with "H1 H1'") as %[_ [=->]%agree_op_invL'].
+        iDestruct (own_valid_2 with "H1 H1'") as %[_ [=->]%to_agree_op_inv_L].
         iApply "HΦ"; auto.
       + iDestruct "H1" as (v1') "(_&H2'&HP)".
-        iDestruct (own_valid_2 with "H2 H2'") as %[_ [=->]%agree_op_invL'].
+        iDestruct (own_valid_2 with "H2 H2'") as %[_ [=->]%to_agree_op_inv_L].
         iApply "HΦ"; auto.
       + iDestruct "H1" as (v1') "[H1 _]"; iDestruct "H2" as (v2') "(_&H2&_)".
         by iDestruct (own_valid_2 with "H1 H2") as %[].