Use round braces instead of curly braces in proof mode tactics.

The intropattern {H} also meant clear (both in ssreflect, and the logic part of the introduction pattern).

Use round braces instead of curly braces in proof mode tactics.
The intropattern {H} also meant clear (both in ssreflect, and the logic part of the introduction pattern).
086cc92c · Robbert Krebbers · 6d2e61e1 · 086cc92c · 086cc92c · 086cc92c
Commit 086cc92c authored Jul 13, 2016 by Robbert Krebbers
25 changed files
--- a/heap_lang/heap.v
+++ b/heap_lang/heap.v
@@ -153,13 +153,13 @@ Section heap.
    to_val e = Some v → nclose N ⊆ E →
    heap_ctx N ★ ▷ (∀ l, l ↦ v ={E}=★ Φ (LitV (LitLoc l))) ⊢ WP Alloc e @ E {{ Φ }}.
  Proof.
-    iIntros {??} "[#Hinv HΦ]". rewrite /heap_ctx.
+    iIntros (??) "[#Hinv HΦ]". rewrite /heap_ctx.
    iPvs (auth_empty heap_name) as "Hheap".
    iApply wp_pvs; iApply (auth_fsa heap_inv (wp_fsa _)); simpl; eauto.
-    iFrame "Hinv Hheap". iIntros {h}. rewrite left_id.
+    iFrame "Hinv Hheap". iIntros (h). rewrite left_id.
    iIntros "[% Hheap]". rewrite /heap_inv.
    iApply wp_alloc_pst; first done. iFrame "Hheap". iNext.
-    iIntros {l} "[% Hheap]"; iPvsIntro; iExists {[ l := (1%Qp, DecAgree v) ]}.
+    iIntros (l) "[% Hheap]"; iPvsIntro; iExists {[ l := (1%Qp, DecAgree v) ]}.
    rewrite -of_heap_insert -(insert_singleton_op h); last by apply of_heap_None.
    iFrame "Hheap". iSplitR; first iPureIntro.
    { by apply alloc_unit_singleton_local_update; first apply of_heap_None. }
@@ -171,10 +171,10 @@ Section heap.
    heap_ctx N ★ ▷ l ↦{q} v ★ ▷ (l ↦{q} v ={E}=★ Φ v)
    ⊢ WP Load (Lit (LitLoc l)) @ E {{ Φ }}.
  Proof.
-    iIntros {?} "[#Hh [Hl HΦ]]".
+    iIntros (?) "[#Hh [Hl HΦ]]".
    rewrite /heap_ctx heap_mapsto_eq /heap_mapsto_def.
    iApply wp_pvs; iApply (auth_fsa heap_inv (wp_fsa _)); simpl; eauto.
-    iFrame "Hh Hl". iIntros {h} "[% Hl]". rewrite /heap_inv.
+    iFrame "Hh Hl". iIntros (h) "[% Hl]". rewrite /heap_inv.
    iApply (wp_load_pst _ (<[l:=v]>(of_heap h)));first by rewrite lookup_insert.
    rewrite of_heap_singleton_op //. iFrame "Hl".
    iIntros "> Hown". iPvsIntro. iExists _; iSplit; first done.
@@ -186,10 +186,10 @@ Section heap.
    heap_ctx N ★ ▷ l ↦ v' ★ ▷ (l ↦ v ={E}=★ Φ (LitV LitUnit))
    ⊢ WP Store (Lit (LitLoc l)) e @ E {{ Φ }}.
  Proof.
-    iIntros {??} "[#Hh [Hl HΦ]]".
+    iIntros (??) "[#Hh [Hl HΦ]]".
    rewrite /heap_ctx heap_mapsto_eq /heap_mapsto_def.
    iApply wp_pvs; iApply (auth_fsa heap_inv (wp_fsa _)); simpl; eauto.
-    iFrame "Hh Hl". iIntros {h} "[% Hl]". rewrite /heap_inv.
+    iFrame "Hh Hl". iIntros (h) "[% Hl]". rewrite /heap_inv.
    iApply (wp_store_pst _ (<[l:=v']>(of_heap h))); rewrite ?lookup_insert //.
    rewrite insert_insert !of_heap_singleton_op; eauto. iFrame "Hl".
    iIntros "> Hown". iPvsIntro. iExists {[l := (1%Qp, DecAgree v)]}; iSplit.
@@ -202,10 +202,10 @@ Section heap.
    heap_ctx N ★ ▷ l ↦{q} v' ★ ▷ (l ↦{q} v' ={E}=★ Φ (LitV (LitBool false)))
    ⊢ WP CAS (Lit (LitLoc l)) e1 e2 @ E {{ Φ }}.
  Proof.
-    iIntros {????} "[#Hh [Hl HΦ]]".
+    iIntros (????) "[#Hh [Hl HΦ]]".
    rewrite /heap_ctx heap_mapsto_eq /heap_mapsto_def.
    iApply wp_pvs; iApply (auth_fsa heap_inv (wp_fsa _)); simpl; eauto 10.
-    iFrame "Hh Hl". iIntros {h} "[% Hl]". rewrite /heap_inv.
+    iFrame "Hh Hl". iIntros (h) "[% Hl]". rewrite /heap_inv.
    iApply (wp_cas_fail_pst _ (<[l:=v']>(of_heap h))); rewrite ?lookup_insert //.
    rewrite of_heap_singleton_op //. iFrame "Hl".
    iIntros "> Hown". iPvsIntro. iExists _; iSplit; first done.
@@ -217,10 +217,10 @@ Section heap.
    heap_ctx N ★ ▷ l ↦ v1 ★ ▷ (l ↦ v2 ={E}=★ Φ (LitV (LitBool true)))
    ⊢ WP CAS (Lit (LitLoc l)) e1 e2 @ E {{ Φ }}.
  Proof.
-    iIntros {???} "[#Hh [Hl HΦ]]".
+    iIntros (???) "[#Hh [Hl HΦ]]".
    rewrite /heap_ctx heap_mapsto_eq /heap_mapsto_def.
    iApply wp_pvs; iApply (auth_fsa heap_inv (wp_fsa _)); simpl; eauto 10.
-    iFrame "Hh Hl". iIntros {h} "[% Hl]". rewrite /heap_inv.
+    iFrame "Hh Hl". iIntros (h) "[% Hl]". rewrite /heap_inv.
    iApply (wp_cas_suc_pst _ (<[l:=v1]>(of_heap h))); rewrite ?lookup_insert //.
    rewrite insert_insert !of_heap_singleton_op; eauto. iFrame "Hl".
    iIntros "> Hown". iPvsIntro. iExists {[l := (1%Qp, DecAgree v2)]}; iSplit.

--- a/heap_lang/lib/barrier/proof.v
+++ b/heap_lang/lib/barrier/proof.v
@@ -81,7 +81,7 @@ Lemma ress_split i i1 i2 Q R1 R2 P I :
    (Q -★ R1 ★ R2) ★ ress P I
  ⊢ ress P ({[i1;i2]} ∪ I ∖ {[i]}).
 Proof.
-  iIntros {????} "(#HQ&#H1&#H2&HQR&H)"; iDestruct "H" as {Ψ} "[HPΨ HΨ]".
+  iIntros (????) "(#HQ&#H1&#H2&HQR&H)"; iDestruct "H" as (Ψ) "[HPΨ HΨ]".
  iDestruct (big_sepS_delete _ _ i with "HΨ") as "[#HΨi HΨ]"; first done.
  iExists (<[i1:=R1]> (<[i2:=R2]> Ψ)). iSplitL "HQR HPΨ".
  - iPoseProof (saved_prop_agree i Q (Ψ i) with "[#]") as "Heq"; first by iSplit.
@@ -99,12 +99,12 @@ Lemma newbarrier_spec (P : iProp) (Φ : val → iProp) :
  heap_ctx heapN ★ (∀ l, recv l P ★ send l P -★ Φ #l)
  ⊢ WP newbarrier #() {{ Φ }}.
 Proof.
-  iIntros {HN} "[#? HΦ]".
+  iIntros (HN) "[#? HΦ]".
  rewrite /newbarrier. wp_seq. wp_alloc l as "Hl".
  iApply "HΦ".
-  iPvs (saved_prop_alloc (F:=idCF) _ P) as {γ} "#?".
+  iPvs (saved_prop_alloc (F:=idCF) _ P) as (γ) "#?".
  iPvs (sts_alloc (barrier_inv l P) _ N (State Low {[ γ ]}) with "[-]")
-    as {γ'} "[#? Hγ']"; eauto.
+    as (γ') "[#? Hγ']"; eauto.
  { iNext. rewrite /barrier_inv /=. iFrame.
    iExists (const P). rewrite !big_sepS_singleton /=. eauto. }
  iAssert (barrier_ctx γ' l P)%I as "#?".
@@ -125,14 +125,14 @@ Lemma signal_spec l P (Φ : val → iProp) :
  send l P ★ P ★ Φ #() ⊢ WP signal #l {{ Φ }}.
 Proof.
  rewrite /signal /send /barrier_ctx.
-  iIntros "(Hs&HP&HΦ)"; iDestruct "Hs" as {γ} "[#(%&Hh&Hsts) Hγ]". wp_let.
+  iIntros "(Hs&HP&HΦ)"; iDestruct "Hs" as (γ) "[#(%&Hh&Hsts) Hγ]". wp_let.
  iSts γ as [p I]; iDestruct "Hγ" as "[Hl Hr]".
  wp_store. iPvsIntro. destruct p; [|done].
  iExists (State High I), (∅ : set token).
  iSplit; [iPureIntro; by eauto using signal_step|].
  iSplitR "HΦ"; [iNext|by auto].
  rewrite {2}/barrier_inv /ress /=; iFrame "Hl".
-  iDestruct "Hr" as {Ψ} "[Hr Hsp]"; iExists Ψ; iFrame "Hsp".
+  iDestruct "Hr" as (Ψ) "[Hr Hsp]"; iExists Ψ; iFrame "Hsp".
  iIntros "> _"; by iApply "Hr".
 Qed.

@@ -140,7 +140,7 @@ Lemma wait_spec l P (Φ : val → iProp) :
  recv l P ★ (P -★ Φ #()) ⊢ WP wait #l {{ Φ }}.
 Proof.
  rename P into R; rewrite /recv /barrier_ctx.
-  iIntros "[Hr HΦ]"; iDestruct "Hr" as {γ P Q i} "(#(%&Hh&Hsts)&Hγ&#HQ&HQR)".
+  iIntros "[Hr HΦ]"; iDestruct "Hr" as (γ P Q i) "(#(%&Hh&Hsts)&Hγ&#HQ&HQR)".
  iLöb as "IH". wp_rec. wp_focus (! _)%E.
  iSts γ as [p I]; iDestruct "Hγ" as "[Hl Hr]".
  wp_load. iPvsIntro. destruct p.
@@ -155,7 +155,7 @@ Proof.
    return to the client *)
    iExists (State High (I ∖ {[ i ]})), (∅ : set token).
    iSplit; [iPureIntro; by eauto using wait_step|].
-    iDestruct "Hr" as {Ψ} "[HΨ Hsp]".
+    iDestruct "Hr" as (Ψ) "[HΨ Hsp]".
    iDestruct (big_sepS_delete _ _ i with "Hsp") as "[#HΨi Hsp]"; first done.
    iAssert (▷ Ψ i ★ ▷ [★ set] j ∈ I ∖ {[i]}, Ψ j)%I with "[HΨ]" as "[HΨ HΨ']".
    { iNext. iApply (big_sepS_delete _ _ i); first done. by iApply "HΨ". }
@@ -171,12 +171,12 @@ Lemma recv_split E l P1 P2 :
  nclose N ⊆ E → recv l (P1 ★ P2) ={E}=> recv l P1 ★ recv l P2.
 Proof.
  rename P1 into R1; rename P2 into R2. rewrite {1}/recv /barrier_ctx.
-  iIntros {?}. iDestruct 1 as {γ P Q i} "(#(%&Hh&Hsts)&Hγ&#HQ&HQR)".
+  iIntros (?). iDestruct 1 as (γ P Q i) "(#(%&Hh&Hsts)&Hγ&#HQ&HQR)".
  iApply pvs_trans'.
  iSts γ as [p I]; iDestruct "Hγ" as "[Hl Hr]".
-  iPvs (saved_prop_alloc_strong _ (R1: ∙%CF iProp) I) as {i1} "[% #Hi1]".
+  iPvs (saved_prop_alloc_strong _ (R1: ∙%CF iProp) I) as (i1) "[% #Hi1]".
  iPvs (saved_prop_alloc_strong _ (R2: ∙%CF iProp) (I ∪ {[i1]}))
-    as {i2} "[Hi2' #Hi2]"; iDestruct "Hi2'" as %Hi2; iPvsIntro.
+    as (i2) "[Hi2' #Hi2]"; iDestruct "Hi2'" as %Hi2; iPvsIntro.
  rewrite ->not_elem_of_union, elem_of_singleton in Hi2; destruct Hi2.
  iExists (State p ({[i1; i2]} ∪ I ∖ {[i]})).
  iExists ({[Change i1; Change i2 ]}).
@@ -199,7 +199,7 @@ Qed.
 Lemma recv_weaken l P1 P2 : (P1 -★ P2) ⊢ recv l P1 -★ recv l P2.
 Proof.
  rewrite /recv.
-  iIntros "HP HP1"; iDestruct "HP1" as {γ P Q i} "(#Hctx&Hγ&Hi&HP1)".
+  iIntros "HP HP1"; iDestruct "HP1" as (γ P Q i) "(#Hctx&Hγ&Hi&HP1)".
  iExists γ, P, Q, i. iFrame "Hctx Hγ Hi".
  iIntros "> HQ". by iApply "HP"; iApply "HP1".
 Qed.

--- a/heap_lang/lib/barrier/specification.v
+++ b/heap_lang/lib/barrier/specification.v
@@ -22,9 +22,9 @@ Proof.
  intros HN.
  exists (λ l, CofeMor (recv heapN N l)), (λ l, CofeMor (send heapN N l)).
  split_and?; simpl.
-  - iIntros {P} "#? ! _". iApply (newbarrier_spec _ _ P); eauto.
-  - iIntros {l P} "! [Hl HP]". by iApply signal_spec; iFrame "Hl HP".
-  - iIntros {l P} "! Hl". iApply wait_spec; iFrame "Hl"; eauto.
+  - iIntros (P) "#? ! _". iApply (newbarrier_spec _ _ P); eauto.
+  - iIntros (l P) "! [Hl HP]". by iApply signal_spec; iFrame "Hl HP".
+  - iIntros (l P) "! Hl". iApply wait_spec; iFrame "Hl"; eauto.
  - intros; by apply recv_split.
  - apply recv_weaken.
 Qed.

--- a/heap_lang/lib/counter.v
+++ b/heap_lang/lib/counter.v
@@ -38,9 +38,9 @@ Lemma newcounter_spec N (R : iProp) Φ :
  heapN ⊥ N →
  heap_ctx heapN ★ (∀ l, counter l 0 -★ Φ #l) ⊢ WP newcounter #() {{ Φ }}.
 Proof.
-  iIntros {?} "[#Hh HΦ]". rewrite /newcounter. wp_seq. wp_alloc l as "Hl".
+  iIntros (?) "[#Hh HΦ]". rewrite /newcounter. wp_seq. wp_alloc l as "Hl".
  iPvs (auth_alloc (counter_inv l) N _ (O:mnat) with "[Hl]")
-    as {γ} "[#? Hγ]"; try by auto.
+    as (γ) "[#? Hγ]"; try by auto.
  iPvsIntro. iApply "HΦ". rewrite /counter; eauto 10.
 Qed.

@@ -48,13 +48,13 @@ Lemma inc_spec l j (Φ : val → iProp) :
  counter l j ★ (counter l (S j) -★ Φ #()) ⊢ WP inc #l {{ Φ }}.
 Proof.
  iIntros "[Hl HΦ]". iLöb as "IH". wp_rec.
-  iDestruct "Hl" as {N γ} "(% & #? & #Hγ & Hγf)".
+  iDestruct "Hl" as (N γ) "(% & #? & #Hγ & Hγf)".
  wp_focus (! _)%E; iApply (auth_fsa (counter_inv l) (wp_fsa _) _ N); auto.
-  iIntros "{$Hγ $Hγf}"; iIntros {j'} "[% Hl] /="; rewrite {2}/counter_inv.
+  iIntros "{$Hγ $Hγf}"; iIntros (j') "[% Hl] /="; rewrite {2}/counter_inv.
  wp_load; iPvsIntro; iExists j; iSplit; [done|iIntros "{$Hl} Hγf"].
  wp_let; wp_op.
  wp_focus (CAS _ _ _); iApply (auth_fsa (counter_inv l) (wp_fsa _) _ N); auto.
-  iIntros "{$Hγ $Hγf}"; iIntros {j''} "[% Hl] /="; rewrite {2}/counter_inv.
+  iIntros "{$Hγ $Hγf}"; iIntros (j'') "[% Hl] /="; rewrite {2}/counter_inv.
  destruct (decide (j `max` j'' = j `max` j')) as [Hj|Hj].
  - wp_cas_suc; first (by do 3 f_equal); iPvsIntro.
    iExists (1 + j `max` j')%nat; iSplit.
@@ -73,9 +73,9 @@ Lemma read_spec l j (Φ : val → iProp) :
  counter l j ★ (∀ i, ■ (j ≤ i)%nat → counter l i -★ Φ #i)
  ⊢ WP read #l {{ Φ }}.
 Proof.
-  iIntros "[Hc HΦ]". iDestruct "Hc" as {N γ} "(% & #? & #Hγ & Hγf)".
+  iIntros "[Hc HΦ]". iDestruct "Hc" as (N γ) "(% & #? & #Hγ & Hγf)".
  rewrite /read. wp_let. iApply (auth_fsa (counter_inv l) (wp_fsa _) _ N); auto.
-  iIntros "{$Hγ $Hγf}"; iIntros {j'} "[% Hl] /=".
+  iIntros "{$Hγ $Hγf}"; iIntros (j') "[% Hl] /=".
  wp_load; iPvsIntro; iExists (j `max` j'); iSplit.
  { iPureIntro; apply mnat_local_update; abstract lia. }
  rewrite !mnat_op_max -Nat.max_assoc Nat.max_idempotent; iIntros "{$Hl} Hγf".

--- a/heap_lang/lib/lock.v
+++ b/heap_lang/lib/lock.v
@@ -44,15 +44,15 @@ Global Instance is_lock_persistent l R : PersistentP (is_lock l R).
 Proof. apply _. Qed.

 Lemma locked_is_lock l R : locked l R ⊢ is_lock l R.
-Proof. rewrite /is_lock. iDestruct 1 as {N γ} "(?&?&?&_)"; eauto. Qed.
+Proof. rewrite /is_lock. iDestruct 1 as (N γ) "(?&?&?&_)"; eauto. Qed.

 Lemma newlock_spec N (R : iProp) Φ :
  heapN ⊥ N →
  heap_ctx heapN ★ R ★ (∀ l, is_lock l R -★ Φ #l) ⊢ WP newlock #() {{ Φ }}.
 Proof.
-  iIntros {?} "(#Hh & HR & HΦ)". rewrite /newlock.
+  iIntros (?) "(#Hh & HR & HΦ)". rewrite /newlock.
  wp_seq. wp_alloc l as "Hl".
-  iPvs (own_alloc (Excl ())) as {γ} "Hγ"; first done.
+  iPvs (own_alloc (Excl ())) as (γ) "Hγ"; first done.
  iPvs (inv_alloc N _ (lock_inv γ l R) with "[-HΦ]") as "#?"; first done.
  { iIntros ">". iExists false. by iFrame. }
  iPvsIntro. iApply "HΦ". iExists N, γ; eauto.
@@ -61,9 +61,9 @@ Qed.
 Lemma acquire_spec l R (Φ : val → iProp) :
  is_lock l R ★ (locked l R -★ R -★ Φ #()) ⊢ WP acquire #l {{ Φ }}.
 Proof.
-  iIntros "[Hl HΦ]". iDestruct "Hl" as {N γ} "(%&#?&#?)".
+  iIntros "[Hl HΦ]". iDestruct "Hl" as (N γ) "(%&#?&#?)".
  iLöb as "IH". wp_rec. wp_focus (CAS _ _ _)%E.
-  iInv N as { [] } "[Hl HR]".
+  iInv N as ([]) "[Hl HR]".
  - wp_cas_fail. iPvsIntro; iSplitL "Hl".
    + iNext. iExists true; eauto.
    + wp_if. by iApply "IH".
@@ -75,8 +75,8 @@ Qed.
 Lemma release_spec R l (Φ : val → iProp) :
  locked l R ★ R ★ Φ #() ⊢ WP release #l {{ Φ }}.
 Proof.
-  iIntros "(Hl&HR&HΦ)"; iDestruct "Hl" as {N γ} "(% & #? & #? & Hγ)".
-  rewrite /release. wp_let. iInv N as {b} "[Hl _]".
+  iIntros "(Hl&HR&HΦ)"; iDestruct "Hl" as (N γ) "(% & #? & #? & Hγ)".
+  rewrite /release. wp_let. iInv N as (b) "[Hl _]".
  wp_store. iPvsIntro. iFrame "HΦ". iNext. iExists false. by iFrame.
 Qed.
 End proof.
--- a/heap_lang/lib/par.v
+++ b/heap_lang/lib/par.v
@@ -27,12 +27,12 @@ Lemma par_spec (Ψ1 Ψ2 : val → iProp) e (f1 f2 : val) (Φ : val → iProp) :
   ∀ v1 v2, Ψ1 v1 ★ Ψ2 v2 -★ ▷ Φ (v1,v2)%V)
  ⊢ WP par e {{ Φ }}.
 Proof.
-  iIntros {??} "(#Hh&Hf1&Hf2&HΦ)".
+  iIntros (??) "(#Hh&Hf1&Hf2&HΦ)".
  rewrite /par. wp_value. iPvsIntro. wp_let. wp_proj.
  wp_apply spawn_spec; try wp_done. iFrame "Hf1 Hh".
-  iIntros {l} "Hl". wp_let. wp_proj. wp_focus (f2 _).
-  iApply wp_wand_l; iFrame "Hf2"; iIntros {v} "H2". wp_let.
-  wp_apply join_spec; iFrame "Hl". iIntros {w} "H1".
+  iIntros (l) "Hl". wp_let. wp_proj. wp_focus (f2 _).
+  iApply wp_wand_l; iFrame "Hf2"; iIntros (v) "H2". wp_let.
+  wp_apply join_spec; iFrame "Hl". iIntros (w) "H1".
  iSpecialize ("HΦ" with "* [-]"); first by iSplitL "H1". by wp_let.
 Qed.

@@ -42,7 +42,7 @@ Lemma wp_par (Ψ1 Ψ2 : val → iProp) (e1 e2 : expr []) (Φ : val → iProp) :
   ∀ v1 v2, Ψ1 v1 ★ Ψ2 v2 -★ ▷ Φ (v1,v2)%V)
  ⊢ WP e1 || e2 {{ Φ }}.
 Proof.
-  iIntros {?} "(#Hh&H1&H2&H)". iApply (par_spec Ψ1 Ψ2); auto.
+  iIntros (?) "(#Hh&H1&H2&H)". iApply (par_spec Ψ1 Ψ2); auto.
  iFrame "Hh H". iSplitL "H1"; by wp_let.
 Qed.
 End proof.
--- a/heap_lang/lib/spawn.v
+++ b/heap_lang/lib/spawn.v
@@ -56,15 +56,15 @@ Lemma spawn_spec (Ψ : val → iProp) e (f : val) (Φ : val → iProp) :
  heap_ctx heapN ★ WP f #() {{ Ψ }} ★ (∀ l, join_handle l Ψ -★ Φ #l)
  ⊢ WP spawn e {{ Φ }}.
 Proof.
-  iIntros {<-%of_to_val ?} "(#Hh & Hf & HΦ)". rewrite /spawn.
+  iIntros (<-%of_to_val ?) "(#Hh & Hf & HΦ)". rewrite /spawn.
  wp_let. wp_alloc l as "Hl". wp_let.
-  iPvs (own_alloc (Excl ())) as {γ} "Hγ"; first done.
+  iPvs (own_alloc (Excl ())) as (γ) "Hγ"; first done.
  iPvs (inv_alloc N _ (spawn_inv γ l Ψ) with "[Hl]") as "#?"; first done.
  { iNext. iExists (InjLV #0). iFrame; eauto. }
  wp_apply wp_fork. iSplitR "Hf".
  - iPvsIntro. wp_seq. iPvsIntro. iApply "HΦ". rewrite /join_handle. eauto.
-  - wp_focus (f _). iApply wp_wand_l. iFrame "Hf"; iIntros {v} "Hv".
-    iInv N as {v'} "[Hl _]"; first wp_done.
+  - wp_focus (f _). iApply wp_wand_l. iFrame "Hf"; iIntros (v) "Hv".
+    iInv N as (v') "[Hl _]"; first wp_done.
    wp_store. iPvsIntro. iSplit; [iNext|done].
    iExists (InjRV v). iFrame. eauto.
 Qed.
@@ -72,12 +72,12 @@ Qed.
 Lemma join_spec (Ψ : val → iProp) l (Φ : val → iProp) :
  join_handle l Ψ ★ (∀ v, Ψ v -★ Φ v) ⊢ WP join #l {{ Φ }}.
 Proof.
-  rewrite /join_handle; iIntros "[[% H] Hv]". iDestruct "H" as {γ} "(#?&Hγ&#?)".
-  iLöb as "IH". wp_rec. wp_focus (! _)%E. iInv N as {v} "[Hl Hinv]".
+  rewrite /join_handle; iIntros "[[% H] Hv]". iDestruct "H" as (γ) "(#?&Hγ&#?)".
+  iLöb as "IH". wp_rec. wp_focus (! _)%E. iInv N as (v) "[Hl Hinv]".
  wp_load. iDestruct "Hinv" as "[%|Hinv]"; subst.
  - iPvsIntro; iSplitL "Hl"; [iNext; iExists _; iFrame; eauto|].
    wp_match. iApply ("IH" with "Hγ Hv").
-  - iDestruct "Hinv" as {v'} "[% [HΨ|Hγ']]"; simplify_eq/=.
+  - iDestruct "Hinv" as (v') "[% [HΨ|Hγ']]"; simplify_eq/=.
    + iPvsIntro; iSplitL "Hl Hγ".
      { iNext. iExists _; iFrame; eauto. }
      wp_match. by iApply "Hv".

--- a/heap_lang/lifting.v
+++ b/heap_lang/lifting.v
@@ -28,9 +28,9 @@ Lemma wp_alloc_pst E σ e v Φ :
  ▷ ownP σ ★ ▷ (∀ l, σ !! l = None ∧ ownP (<[l:=v]>σ) ={E}=★ Φ (LitV (LitLoc l)))
  ⊢ WP Alloc e @ E {{ Φ }}.
 Proof.
-  iIntros {?}  "[HP HΦ]".
+  iIntros (?)  "[HP HΦ]".
  iApply (wp_lift_atomic_head_step (Alloc e) σ); try (by simpl; eauto).
-  iFrame "HP". iNext. iIntros {v2 σ2 ef} "[% HP]". inv_head_step.
+  iFrame "HP". iNext. iIntros (v2 σ2 ef) "[% HP]". inv_head_step.
  match goal with H: _ = of_val v2 |- _ => apply (inj of_val (LitV _)) in H end.
  subst v2. iSplit; last done. iApply "HΦ"; by iSplit.
 Qed.

--- a/program_logic/auth.v
+++ b/program_logic/auth.v
@@ -70,8 +70,8 @@ Section auth.
    ✓ a → nclose N ⊆ E →
    ▷ φ a ={E}=> ∃ γ, ■(γ ∉ G) ∧ auth_ctx γ N φ ∧ auth_own γ a.
  Proof.
-    iIntros {??} "Hφ". rewrite /auth_own /auth_ctx.
-    iPvs (own_alloc_strong (Auth (Excl' a) a) _ G) as {γ} "[% Hγ]"; first done.
+    iIntros (??) "Hφ". rewrite /auth_own /auth_ctx.
+    iPvs (own_alloc_strong (Auth (Excl' a) a) _ G) as (γ) "[% Hγ]"; first done.
    iRevert "Hγ"; rewrite auth_both_op; iIntros "[Hγ Hγ']".
    iPvs (inv_alloc N _ (auth_inv γ φ) with "[-Hγ']"); first done.
    { iNext. iExists a. by iFrame. }
@@ -82,8 +82,8 @@ Section auth.
    ✓ a → nclose N ⊆ E →
    ▷ φ a ={E}=> ∃ γ, auth_ctx γ N φ ∧ auth_own γ a.
  Proof.
-    iIntros {??} "Hφ".
-    iPvs (auth_alloc_strong N E a ∅ with "Hφ") as {γ} "[_ ?]"; [done..|].
+    iIntros (??) "Hφ".
+    iPvs (auth_alloc_strong N E a ∅ with "Hφ") as (γ) "[_ ?]"; [done..|].
    by iExists γ.
  Qed.

@@ -100,16 +100,16 @@ Section auth.
        ■ (a ~l~> b @ Some af) ★ ▷ φ (b ⋅ af) ★ (auth_own γ b -★ Ψ x)))
     ⊢ fsa E Ψ.
  Proof.
-    iIntros {??} "(#? & Hγf & HΨ)". rewrite /auth_ctx /auth_own.
-    iInv N as {a'} "[Hγ Hφ]".
+    iIntros (??) "(#? & Hγf & HΨ)". rewrite /auth_ctx /auth_own.
+    iInv N as (a') "[Hγ Hφ]".
    iTimeless "Hγ"; iTimeless "Hγf"; iCombine "Hγ" "Hγf" as "Hγ".
    iDestruct (own_valid _ with "#Hγ") as "Hvalid".
    iDestruct (auth_validI _ with "Hvalid") as "[Ha' %]"; simpl; iClear "Hvalid".
-    iDestruct "Ha'" as {af} "Ha'"; iDestruct "Ha'" as %Ha'.
+    iDestruct "Ha'" as (af) "Ha'"; iDestruct "Ha'" as %Ha'.
    rewrite ->(left_id _ _) in Ha'; setoid_subst.
    iApply pvs_fsa_fsa; iApply fsa_wand_r; iSplitL "HΨ Hφ".
    { iApply "HΨ"; by iSplit. }
-    iIntros {v}; iDestruct 1 as {b} "(% & Hφ & HΨ)".
+    iIntros (v); iDestruct 1 as (b) "(% & Hφ & HΨ)".
    iPvs (own_update _ with "Hγ") as "[Hγ Hγf]"; first eapply auth_update; eauto.
    iPvsIntro. iSplitL "Hφ Hγ"; last by iApply "HΨ".
    iNext. iExists (b ⋅ af). by iFrame.

--- a/program_logic/boxes.v
+++ b/program_logic/boxes.v
@@ -94,10 +94,10 @@ Lemma box_insert f P Q :
  ▷ box N f P ={N}=> ∃ γ, f !! γ = None ★
    slice N γ Q ★ ▷ box N (<[γ:=false]> f) (Q ★ P).
 Proof.
-  iDestruct 1 as {Φ} "[#HeqP Hf]".
+  iDestruct 1 as (Φ) "[#HeqP Hf]".
  iPvs (own_alloc_strong (● Excl' false ⋅ ◯ Excl' false,
    Some (to_agree (Next (iProp_unfold Q)))) _ (dom _ f))
-    as {γ} "[Hdom Hγ]"; first done.
+    as (γ) "[Hdom Hγ]"; first done.
  rewrite pair_split. iDestruct "Hγ" as "[[Hγ Hγ'] #HγQ]".
  iDestruct "Hdom" as % ?%not_elem_of_dom.
  iPvs (inv_alloc N _ (slice_inv γ Q) with "[Hγ]") as "#Hinv"; first done.
@@ -114,9 +114,9 @@ Lemma box_delete f P Q γ :
  slice N γ Q ★ ▷ box N f P ={N}=> ∃ P',
    ▷ ▷ (P ≡ (Q ★ P')) ★ ▷ box N (delete γ f) P'.
 Proof.
-  iIntros {?} "[#Hinv H]"; iDestruct "H" as {Φ} "[#HeqP Hf]".
+  iIntros (?) "[#Hinv H]"; iDestruct "H" as (Φ) "[#HeqP Hf]".
  iExists ([★ map] γ'↦_ ∈ delete γ f, Φ γ')%I.
-  iInv N as {b} "(Hγ & #HγQ &_)"; iPvsIntro; iNext.
+  iInv N as (b) "(Hγ & #HγQ &_)"; iPvsIntro; iNext.
  iDestruct (big_sepM_delete _ f _ false with "Hf")
    as "[[Hγ' #[HγΦ ?]] ?]"; first done.
  iDestruct (box_own_agree γ Q (Φ γ) with "[#]") as "HeqQ"; first by eauto.
@@ -132,8 +132,8 @@ Lemma box_fill f γ P Q :
  f !! γ = Some false →
  slice N γ Q ★ ▷ Q ★ ▷ box N f P ={N}=> ▷ box N (<[γ:=true]> f) P.
 Proof.
-  iIntros {?} "(#Hinv & HQ & H)"; iDestruct "H" as {Φ} "[#HeqP Hf]".
-  iInv N as {b'} "(Hγ & #HγQ & _)"; iTimeless "Hγ".
+  iIntros (?) "(#Hinv & HQ & H)"; iDestruct "H" as (Φ) "[#HeqP Hf]".
+  iInv N as (b') "(Hγ & #HγQ & _)"; iTimeless "Hγ".
  iDestruct (big_sepM_later _ f with "Hf") as "Hf".
  iDestruct (big_sepM_delete _ f _ false with "Hf")
    as "[[Hγ' #[HγΦ Hinv']] ?]"; first done; iTimeless "Hγ'".
@@ -150,8 +150,8 @@ Lemma box_empty f P Q γ :
  f !! γ = Some true →
  slice N γ Q ★ ▷ box N f P ={N}=> ▷ Q ★ ▷ box N (<[γ:=false]> f) P.
 Proof.
-  iIntros {?} "[#Hinv H]"; iDestruct "H" as {Φ} "[#HeqP Hf]".
-  iInv N as {b} "(Hγ & #HγQ & HQ)"; iTimeless "Hγ".
+  iIntros (?) "[#Hinv H]"; iDestruct "H" as (Φ) "[#HeqP Hf]".
+  iInv N as (b) "(Hγ & #HγQ & HQ)"; iTimeless "Hγ".
  iDestruct (big_sepM_later _ f with "Hf") as "Hf".
  iDestruct (big_sepM_delete _ f with "Hf")
    as "[[Hγ' #[HγΦ Hinv']] ?]"; first done; iTimeless "Hγ'".
@@ -169,14 +169,14 @@ Qed.

 Lemma box_fill_all f P Q : box N f P ★ ▷ P ={N}=> box N (const true <$> f) P.
 Proof.
-  iIntros "[H HP]"; iDestruct "H" as {Φ} "[#HeqP Hf]".
+  iIntros "[H HP]"; iDestruct "H" as (Φ) "[#HeqP Hf]".
  iExists Φ; iSplitR; first by rewrite big_sepM_fmap.
  rewrite eq_iff later_iff big_sepM_later; iDestruct ("HeqP" with "HP") as "HP".
  iCombine "Hf" "HP" as "Hf".
  rewrite big_sepM_fmap; iApply (pvs_big_sepM _ _ f).
  iApply (big_sepM_impl _ _ f); iFrame "Hf".
-  iAlways; iIntros {γ b' ?} "[(Hγ' & #$ & #$) HΦ]".
-  iInv N as {b} "[Hγ _]"; iTimeless "Hγ".
+  iAlways; iIntros (γ b' ?) "[(Hγ' & #$ & #$) HΦ]".
+  iInv N as (b) "[Hγ _]"; iTimeless "Hγ".
  iPvs (box_own_auth_update _ γ with "[Hγ Hγ']")
    as "[Hγ $]"; first by iFrame.
  iPvsIntro; iNext; iExists true. by iFrame.
@@ -186,13 +186,13 @@ Lemma box_empty_all f P Q :
  map_Forall (λ _, (true =)) f →
  box N f P ={N}=> ▷ P ★ box N (const false <$> f) P.
 Proof.
-  iDestruct 1 as {Φ} "[#HeqP Hf]".
+  iDestruct 1 as (Φ) "[#HeqP Hf]".
  iAssert ([★ map] γ↦b ∈ f, ▷ Φ γ ★ box_own_auth γ (◯ Excl' false) ★
    box_own_prop γ (Φ γ) ★ inv N (slice_inv γ (Φ γ)))%I with "|==>[Hf]" as "[HΦ ?]".
  { iApply (pvs_big_sepM _ _ f); iApply (big_sepM_impl _ _ f); iFrame "Hf".
-    iAlways; iIntros {γ b ?} "(Hγ' & #$ & #$)".
+    iAlways; iIntros (γ b ?) "(Hγ' & #$ & #$)".
    assert (true = b) as <- by eauto.
-    iInv N as {b} "(Hγ & _ & HΦ)"; iTimeless "Hγ".
+    iInv N as (b) "(Hγ & _ & HΦ)"; iTimeless "Hγ".
    iDestruct (box_own_auth_agree γ b true with "[#]")
      as "%"; subst; first by iFrame.
    iPvs (box_own_auth_update _ γ true true false with "[Hγ Hγ']")

--- a/program_logic/ectx_lifting.v
+++ b/program_logic/ectx_lifting.v
@@ -25,9 +25,9 @@ Lemma wp_lift_head_step E1 E2 Φ e1 :
                                 ={E2,E1}=★ WP e2 @ E1 {{ Φ }} ★ wp_fork ef)
  ⊢ WP e1 @ E1 {{ Φ }}.
 Proof.
-  iIntros {??} "H". iApply (wp_lift_step E1 E2); try done.
-  iPvs "H" as {σ1} "(%&Hσ1&Hwp)". set_solver. iPvsIntro. iExists σ1.
-  iSplit; first by eauto. iFrame. iNext. iIntros {e2 σ2 ef} "[% ?]".
+  iIntros (??) "H". iApply (wp_lift_step E1 E2); try done.
+  iPvs "H" as (σ1) "(%&Hσ1&Hwp)". set_solver. iPvsIntro. iExists σ1.
+  iSplit; first by eauto. iFrame. iNext. iIntros (e2 σ2 ef) "[% ?]".
  iApply "Hwp". by eauto.
 Qed.

@@ -38,8 +38,8 @@ Lemma wp_lift_pure_head_step E Φ e1 :
  (▷ ∀ e2 ef σ, ■ head_step e1 σ e2 σ ef → WP e2 @ E {{ Φ }} ★ wp_fork ef)
  ⊢ WP e1 @ E {{ Φ }}.
 Proof.
-  iIntros {???} "H". iApply wp_lift_pure_step; eauto. iNext.
-  iIntros {????}. iApply "H". eauto.
+  iIntros (???) "H". iApply wp_lift_pure_step; eauto. iNext.
+  iIntros (????). iApply "H". eauto.
 Qed.

 Lemma wp_lift_atomic_head_step {E Φ} e1 σ1 :
@@ -49,8 +49,8 @@ Lemma wp_lift_atomic_head_step {E Φ} e1 σ1 :
  ■ head_step e1 σ1 (of_val v2) σ2 ef ∧ ownP σ2 -★ (|={E}=> Φ v2) ★ wp_fork ef)
  ⊢ WP e1 @ E {{ Φ }}.
 Proof.
-  iIntros {??} "[? H]". iApply wp_lift_atomic_step; eauto. iFrame. iNext.
-  iIntros {???} "[% ?]". iApply "H". eauto.
+  iIntros (??) "[? H]". iApply wp_lift_atomic_step; eauto. iFrame. iNext.
+  iIntros (???) "[% ?]". iApply "H". eauto.
 Qed.

 Lemma wp_lift_atomic_det_head_step {E Φ e1} σ1 v2 σ2 ef :

--- a/program_logic/hoare.v
+++ b/program_logic/hoare.v
@@ -53,7 +53,7 @@ Global Instance ht_mono' E :
 Proof. solve_proper. Qed.

 Lemma ht_alt E P Φ e : (P ⊢ WP e @ E {{ Φ }}) → {{ P }} e @ E {{ Φ }}.
-Proof. iIntros {Hwp} "! HP". by iApply Hwp. Qed.
+Proof. iIntros (Hwp) "! HP". by iApply Hwp. Qed.

 Lemma ht_val E v : {{ True : iProp Λ Σ }} of_val v @ E {{ v', v = v' }}.
 Proof. iIntros "! _". by iApply wp_value'. Qed.
@@ -64,7 +64,7 @@ Lemma ht_vs E P P' Φ Φ' e :
 Proof.
  iIntros "(#Hvs&#Hwp&#HΦ) ! HP". iPvs ("Hvs" with "HP") as "HP".
  iApply wp_pvs; iApply wp_wand_r; iSplitL; [by iApply "Hwp"|].
-  iIntros {v} "Hv". by iApply "HΦ".
+  iIntros (v) "Hv". by iApply "HΦ".
 Qed.

 Lemma ht_atomic E1 E2 P P' Φ Φ' e :
@@ -72,10 +72,10 @@ Lemma ht_atomic E1 E2 P P' Φ Φ' e :
  (P ={E1,E2}=> P') ∧ {{ P' }} e @ E2 {{ Φ' }} ∧ (∀ v, Φ' v ={E2,E1}=> Φ v)
  ⊢ {{ P }} e @ E1 {{ Φ }}.
 Proof.
-  iIntros {??} "(#Hvs&#Hwp&#HΦ) ! HP". iApply (wp_atomic _ E2); auto.
+  iIntros (??) "(#Hvs&#Hwp&#HΦ) ! HP". iApply (wp_atomic _ E2); auto.
  iPvs ("Hvs" with "HP") as "HP"; first set_solver. iPvsIntro.
  iApply wp_wand_r; iSplitL; [by iApply "Hwp"|].
-  iIntros {v} "Hv". by iApply "HΦ".
+  iIntros (v) "Hv". by iApply "HΦ".