From f35ec71ca11f544a6918e60dfa4564de0f4897ce Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Thu, 10 Aug 2023 09:33:43 +0100
Subject: [PATCH] Update to Eio 0.12

---
 mirage-crypto-rng-eio.opam        |  2 +-
 rng/eio/mirage_crypto_rng_eio.ml  | 12 ++++++------
 rng/eio/mirage_crypto_rng_eio.mli | 13 +++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/mirage-crypto-rng-eio.opam b/mirage-crypto-rng-eio.opam
index dd219cf1..434ae8d1 100644
--- a/mirage-crypto-rng-eio.opam
+++ b/mirage-crypto-rng-eio.opam
@@ -15,7 +15,7 @@ build: [ ["dune" "subst"] {dev}
 depends: [
   "ocaml" {>= "5.0.0"}
   "dune" {>= "2.7"}
-  "eio" {>= "0.7"}
+  "eio" {>= "0.12"}
   "cstruct" {>= "6.0.0"}
   "logs"
   "mirage-crypto-rng" {=version}
diff --git a/rng/eio/mirage_crypto_rng_eio.ml b/rng/eio/mirage_crypto_rng_eio.ml
index f6f5e1fb..2aee4e10 100644
--- a/rng/eio/mirage_crypto_rng_eio.ml
+++ b/rng/eio/mirage_crypto_rng_eio.ml
@@ -1,11 +1,11 @@
-
 open Mirage_crypto_rng
 
-type env = <
-  clock: Eio.Time.clock;
-  mono_clock: Eio.Time.Mono.t;
-  secure_random: Eio.Flow.source;
->
+type 'a env = <
+  clock: [> ] Eio.Time.clock;
+  mono_clock: [> ] Eio.Time.Mono.t;
+  secure_random: [> ] Eio.Flow.source;
+  ..
+> as 'a
 
 let src = Logs.Src.create "mirage-crypto-rng-eio" ~doc:"Mirage crypto RNG Eio"
 module Log = (val Logs.src_log src: Logs.LOG)
diff --git a/rng/eio/mirage_crypto_rng_eio.mli b/rng/eio/mirage_crypto_rng_eio.mli
index 117d21ca..e20d179a 100644
--- a/rng/eio/mirage_crypto_rng_eio.mli
+++ b/rng/eio/mirage_crypto_rng_eio.mli
@@ -4,11 +4,12 @@
     [Eio.Stdenv.secure_random] is used as the [getrandom()] implementation.
 *)
 
-type env = <
-  clock: Eio.Time.clock;
-  mono_clock: Eio.Time.Mono.t;
-  secure_random: Eio.Flow.source;
-  >
+type 'a env = <
+  clock: [> ]Eio.Time.clock;
+  mono_clock: [> ]Eio.Time.Mono.t;
+  secure_random: [> ] Eio.Flow.source;
+  ..
+> as 'a
 
 (** [run ~g ~sleep gen env fn] will bring the RNG into a working state. The argument
     [sleep] is measured in ns (default 1s), and is used to sleep between collection
@@ -36,5 +37,5 @@ val run
   :  ?g:'a
   -> ?sleep:int64
   -> 'a Mirage_crypto_rng.generator
-  -> <env; ..>
+  -> _ env
   -> (unit -> 'b) -> 'b