Merge pull request #346 from talex5/beta1

Update to OCaml 5.0.0~beta1

Author: talex5

Dockerfile

@@ -4,7 +4,9 @@ RUN sudo ln -sf /usr/bin/opam-2.1 /usr/bin/opam
 # Add the alpha repository with some required preview versions of dependencies:
 RUN opam remote add alpha git+https://github.com/kit-ty-kate/opam-alpha-repository.git
 # Ensure opam-repository is up-to-date:
-RUN cd opam-repository && git pull origin 42a177d7ac37cd347aab366a90d20469203fc926 && opam update
+RUN cd opam-repository && git pull -q origin 7791c44928d6c1594479a50bb8051856fa2c0ca1 && opam update
+# Switch to OCaml 5.0.0 (beta)
+RUN opam pin remove ocaml-variants && opam install ocaml-base-compiler.5.0.0~beta1 --update-invariant
 # Install utop for interactive use:
 RUN opam install utop fmt
 # Install Eio's dependencies (adding just the opam files first to help with caching):

README.md

@@ -109,21 +109,19 @@ Remember that you can always fall back to using Lwt libraries to provide missing
 
 ## Getting OCaml 5.0
 
-You'll need OCaml 5.0.0~alpha1.
+You'll need OCaml 5.0.0~beta1.
 You can either install it yourself or build the included [Dockerfile](./Dockerfile).
 
 To install it yourself:
 
 1. Make sure you have opam 2.1 or later (run `opam --version` to check).
 
-2. Use opam to install OCaml 5.0.0~alpha1:
+2. Use opam to install OCaml 5.0.0~beta1:
 
    ```
-   opam switch create 5.0.0~alpha1 --repo=default,alpha=git+https://github.com/kit-ty-kate/opam-alpha-repository.git
+   opam switch create 5.0.0~beta1 --repo=default,alpha=git+https://github.com/kit-ty-kate/opam-alpha-repository.git
    ```
 
-Note: if you want to use OCaml trunk instead, you'll need [#329](https://github.com/ocaml-multicore/eio/pull/329).
-
 ## Getting Eio
 
 If you want to run the latest development version from Git, run these commands

dune-project

@@ -11,6 +11,8 @@
  (name eio)
  (synopsis "Effect-based direct-style IO API for OCaml")
  (description "An effect-based IO API for multicore OCaml with fibers.")
+ (conflicts
+  (ocaml-base-compiler (< 5.0.0~beta1)))
  (depends
   (ocaml (>= 5.0.0))
   (bigstringaf (>= 0.9.0))

eio.opam

@@ -24,6 +24,9 @@ depends: [
   "alcotest" {>= "1.4.0" & with-test}
   "odoc" {with-doc}
 ]
+conflicts: [
+  "ocaml-base-compiler" {< "5.0.0~beta1"}
+]
 build: [
   ["dune" "subst"] {dev}
   [

lib_eio/core/debug.ml

@@ -29,7 +29,7 @@ let traceln ?__POS__ fmt =
     match Fiber.get traceln_key with
     | Some { traceln } -> traceln
     | None
-    | exception Unhandled -> default_traceln
+    | exception (Effect.Unhandled _) -> default_traceln
   in
   traceln ?__POS__ fmt