Merge pull request #186 from vbmithr/v0.14

async: fix compilation with v0.14
inhabitedtype · Sep 8, 2020 · a783ec0 · a783ec0
2 parents 7cb075b + d1c8655
commit a783ec0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,6 @@ env:
   - TESTS=true
   - POST_INSTALL_HOOK="opam install --with-test httpaf-async httpaf-lwt-unix && opam exec -- make examples"
   matrix:
-  - OCAML_VERSION="4.07"
-  - OCAML_VERSION="4.06"
-  - OCAML_VERSION="4.05"
+  - OCAML_VERSION="4.10"
+  - OCAML_VERSION="4.09"
+  - OCAML_VERSION="4.08"
diff --git a/async/httpaf_async.ml b/async/httpaf_async.ml
@@ -77,12 +77,12 @@ let read fd buffer =
           (fun file_descr ->
             Buffer.put buffer ~f:(fun bigstring ~off ~len ->
               Unix.Syscall_result.Int.ok_or_unix_error_exn ~syscall_name:"read"
-                (Bigstring.read_assume_fd_is_nonblocking file_descr bigstring ~pos:off ~len))))
+                (Bigstring_unix.read_assume_fd_is_nonblocking file_descr bigstring ~pos:off ~len))))
     else
       Fd.syscall_in_thread fd ~name:"read"
         (fun file_descr ->
           Buffer.put buffer ~f:(fun bigstring ~off ~len ->
-            Bigstring.read file_descr bigstring ~pos:off ~len))
+            Bigstring_unix.read file_descr bigstring ~pos:off ~len))
       >>= fun result -> finish fd buffer result
   in
   go fd buffer

diff --git a/httpaf-async.opam b/httpaf-async.opam
@@ -12,10 +12,10 @@ build: [
   ["dune" "runtest" "-p" name] {with-test}
 ]
 depends: [
-  "ocaml" {>= "4.03.0"}
+  "ocaml" {>= "4.08.0"}
   "dune" {>= "1.5.0"}
-  "faraday-async"
-  "async"
-  "httpaf" {>= "0.6.0"}
+  "faraday-async" {>= "0.7.2"}
+  "async" {>= "v0.14.0"}
+  "httpaf" {= version}
 ]
 synopsis: "Async support for http/af"