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

opam

@@ -9,6 +9,6 @@ build: [make "-j%{jobs}%"]
 install: [make "install"]
 remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/reloc"]
 depends: [
-  "coq-iris" { (= "dev.2020-04-04.3.9b2ad256") | (= "dev") }
+  "coq-iris" { (= "dev.2020-04-07.7.64bed0ca") | (= "dev") }
   "coq-autosubst" { = "dev.coq86" }
 ]

theories/logic/spec_ra.v

@@ -127,7 +127,7 @@ Section mapsto.
   Global Instance mapsto_fractional l v : Fractional (λ q, l ↦ₛ{q} v)%I.
   Proof.
     intros p q. rewrite heapS_mapsto_eq -own_op -auth_frag_op.
-    by rewrite -pair_op op_singleton -pair_op agree_idemp right_id.
+    by rewrite -pair_op singleton_op -pair_op agree_idemp right_id.
   Qed.
   Global Instance mapsto_as_fractional l q v :
     AsFractional (l ↦ₛ{q} v) (λ q, l ↦ₛ{q} v)%I q.
@@ -138,7 +138,7 @@ Section mapsto.
     apply bi.wand_intro_r.
     rewrite heapS_mapsto_eq -own_op -auth_frag_op own_valid uPred.discrete_valid.
     f_equiv=> /=.
-    rewrite -pair_op op_singleton right_id -pair_op.
+    rewrite -pair_op singleton_op right_id -pair_op.
     move=> [_ Hv]. move:Hv => /=.
     rewrite singleton_valid.
     by intros [_ ?%agree_op_invL'].