From 0fb228f7f59a1a95e1a77caf3f300232101a3e2f Mon Sep 17 00:00:00 2001 From: Ralf Jung <jung@mpi-sws.org> Date: Sat, 28 Oct 2017 15:08:19 +0200 Subject: [PATCH] bump Iris, fix compilation --- opam | 2 +- theories/lifetime/model/primitive.v | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opam b/opam index 585f8d04..3236b964 100644 --- a/opam +++ b/opam @@ -10,5 +10,5 @@ build: [make "-j%{jobs}%"] install: [make "install"] remove: [ "sh" "-c" "rm -rf '%{lib}%/coq/user-contrib/lrust'" ] depends: [ - "coq-iris" { (= "dev.2017-10-26.0") | (= "dev") } + "coq-iris" { (= "dev.2017-10-27.0") | (= "dev") } ] diff --git a/theories/lifetime/model/primitive.v b/theories/lifetime/model/primitive.v index a4c995fc..629093d7 100644 --- a/theories/lifetime/model/primitive.v +++ b/theories/lifetime/model/primitive.v @@ -328,7 +328,7 @@ Proof. reflexivity. Qed. Lemma lft_intersect_incl_l κ κ': (κ ⊓ κ' ⊑ κ)%I. Proof. - iIntros "!#". iSplitR. + unfold lft_incl. iIntros "!#". iSplitR. - iIntros (q). rewrite <-lft_tok_sep. iIntros "[H Hf]". iExists q. iFrame. rewrite <-lft_tok_sep. by iIntros "!>{$Hf}$". - iIntros "? !>". iApply lft_dead_or. auto. @@ -338,7 +338,7 @@ Lemma lft_intersect_incl_r κ κ': (κ ⊓ κ' ⊑ κ')%I. Proof. rewrite comm. apply lft_intersect_incl_l. Qed. Lemma lft_incl_refl κ : (κ ⊑ κ)%I. -Proof. iIntros "!#"; iSplitR; auto 10 with iFrame. Qed. +Proof. unfold lft_incl. iIntros "!#"; iSplitR; auto 10 with iFrame. Qed. Lemma lft_incl_trans κ κ' κ'': κ ⊑ κ' -∗ κ' ⊑ κ'' -∗ κ ⊑ κ''. Proof. -- GitLab