From 63aa88eae5cd1bebc72b6cc0fda9c183d8470c26 Mon Sep 17 00:00:00 2001 From: Ralf Jung <jung@mpi-sws.org> Date: Tue, 13 Oct 2020 11:48:26 +0200 Subject: [PATCH] some of these changes were unnecessary --- theories/lang/lib/arc.v | 2 +- theories/typing/lib/rc/rc.v | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/theories/lang/lib/arc.v b/theories/lang/lib/arc.v index 9935dbf2..5ec249ec 100644 --- a/theories/lang/lib/arc.v +++ b/theories/lang/lib/arc.v @@ -616,7 +616,7 @@ Section arc. + setoid_subst. iDestruct "H" as (?) "(Hq & ? & ? & >? & >%)". subst. wp_read. iMod (own_update_2 with "Hâ— Hâ—¯") as "Hâ—". { apply auth_update_dealloc. rewrite -{1}[(_, 0%nat)]right_id. - apply: cancel_local_update_unit. } + apply cancel_local_update_unit, _. } iMod ("Hclose" with "[Hâ—]") as "_"; first by iExists _; iFrame. iModIntro. wp_seq. wp_op. wp_let. wp_op. wp_write. iApply "HΦ". iDestruct "Hq" as %<-. iFrame. diff --git a/theories/typing/lib/rc/rc.v b/theories/typing/lib/rc/rc.v index a566f84f..6f720ade 100644 --- a/theories/typing/lib/rc/rc.v +++ b/theories/typing/lib/rc/rc.v @@ -294,7 +294,7 @@ Section code. -- iLeft. iSplit; first done. rewrite Hincls. iFrame "Hl†". iMod (own_update_2 with "Hst Htok") as "Hst". { apply auth_update_dealloc. rewrite -{1}(right_id (None, 0%nat) _ (_, _)). - apply: cancel_local_update_unit. } + apply cancel_local_update_unit, _. } rewrite -[in (1).[ν]%I]Hqq' -[(|={↑lft_userN,⊤}=>_)%I]fupd_trans. iApply step_fupd_mask_mono; last iMod ("Hνend" with "[$Hν $Hν1]") as "H†"; try done. @@ -329,7 +329,7 @@ Section code. * iIntros "Hl1". iMod (own_update_2 with "Hst Htok") as "[Hst Htok]". { apply auth_update. etrans. - - rewrite [(Some _, weak)]pair_split. apply: cancel_local_update_unit. + - rewrite [(Some _, weak)]pair_split. apply cancel_local_update_unit, _. - apply (op_local_update _ _ (Some (Cinr (Excl tt)), 0%nat)). auto. } rewrite -[(|={↑lft_userN,⊤}=>_)%I]fupd_trans -[in (1).[ν]%I]Hqq'. iApply step_fupd_mask_mono; @@ -356,7 +356,7 @@ Section code. iApply ("Hclose" with "[>- $Hna]"). iExists (None, 0%nat). iMod (own_update_2 with "Hst Htok") as "$"; last done. apply auth_update_dealloc. rewrite -{1}(right_id (None, 0%nat) _ (_, _)). - apply: cancel_local_update_unit. + apply cancel_local_update_unit, _. -- iRight. iSplitR; first by auto with lia. iIntros "!> Hl†Hl2 Hvl". iApply ("Hclose" with "[>- $Hna]"). iExists (None, S weak). rewrite Hincls. iFrame. iSplitR "Hl2"; last first. -- GitLab