From 8a12ebc22bd9f0c0991094d884facca235cb001a Mon Sep 17 00:00:00 2001
From: Robbert Krebbers <mail@robbertkrebbers.nl>
Date: Fri, 11 Jun 2021 11:00:36 +0200
Subject: [PATCH] Bump std++ and rewrite `Proper` of `from_option` to match new
 `Params`.

---
 coq-iris.opam      | 2 +-
 iris/algebra/ofe.v | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/coq-iris.opam b/coq-iris.opam
index 6eca94abb..5539ec6c2 100644
--- a/coq-iris.opam
+++ b/coq-iris.opam
@@ -15,7 +15,7 @@ iris.prelude, iris.algebra, iris.si_logic, iris.bi, iris.proofmode, iris.base_lo
 
 depends: [
   "coq" { (>= "8.12" & < "8.14~") | (= "dev") }
-  "coq-stdpp" { (= "dev.2021-06-08.1.17776cbd") | (= "dev") }
+  "coq-stdpp" { (= "dev.2021-06-11.0.ca70af1d") | (= "dev") }
 ]
 
 build: ["./make-package" "iris" "-j%{jobs}%"]
diff --git a/iris/algebra/ofe.v b/iris/algebra/ofe.v
index 29271bc6e..96bf09910 100644
--- a/iris/algebra/ofe.v
+++ b/iris/algebra/ofe.v
@@ -1020,8 +1020,8 @@ Section option.
   Proof. destruct 1; split; eauto. Qed.
   Global Instance Some_dist_inj n : Inj (dist n) (dist n) (@Some A).
   Proof. by inversion_clear 1. Qed.
-  Global Instance from_option_ne {B} (R : relation B) (f : A → B) n :
-    Proper (dist n ==> R) f → Proper (R ==> dist n ==> R) (from_option f).
+  Global Instance from_option_ne {B} (R : relation B) n :
+    Proper ((dist (A:=A) n ==> R) ==> R ==> dist n ==> R) from_option.
   Proof. destruct 3; simpl; auto. Qed.
 
   Global Instance None_discrete : Discrete (@None A).
-- 
GitLab