Merge branch 'master' into gha

.github/workflows/ci.yml

@@ -7,15 +7,15 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-        ocaml-compiler:
+        ocaml:
           - 5.0.x
           - 4.14.x
           - 4.02.x
         include:
           - os: macos-latest
-            ocaml-compiler: 4.14.x
+            ocaml: 4.14.x
           - os: windows-latest
-            ocaml-compiler: 4.14.x
+            ocaml: 4.14.x
       fail-fast: false
     runs-on: ${{ matrix.os }}
 
@@ -25,7 +25,7 @@ jobs:
           submodules: recursive
       - uses: ocaml/setup-ocaml@v2
         with:
-          ocaml-compiler: ${{ matrix.ocaml-compiler }}
+          ocaml-compiler: ${{ matrix.ocaml }}
       - run: opam depext -y conf-pkg-config
       - run: opam install -y --deps-only .
       - run: opam exec -- dune build -p luv

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2018-2021 Anton Bachin
+Copyright (c) 2018-2023 Anton Bachin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,7 @@
 # Luv    [![libuv][libuv-version]][libuv-releases]
 
 [libuv-releases]: https://github.com/libuv/libuv/releases
-[libuv-version]: https://img.shields.io/badge/libuv-1.43.0-blue.svg
+[libuv-version]: https://img.shields.io/badge/libuv-1.44.2-blue.svg
 
 [**Luv**][luv] is a neatly-packaged OCaml/Reason binding to [libuv][libuv], the
 cross-platform C library that does asynchronous I/O in Node.js and runs Node's

src/c/dune

@@ -45,7 +45,6 @@ let () = Jbuild_plugin.V1.send @@ {|
  (files
   (vendor/libuv/include/uv.h as uv.h)
   (vendor/libuv/include/uv/aix.h as uv/aix.h)
-  (vendor/libuv/include/uv/android-ifaddrs.h as uv/android-ifaddrs.h)
   (vendor/libuv/include/uv/bsd.h as uv/bsd.h)
   (vendor/libuv/include/uv/darwin.h as uv/darwin.h)
   (vendor/libuv/include/uv/errno.h as uv/errno.h)

src/c/luv_c_function_descriptions.ml

@@ -1708,6 +1708,10 @@ struct
   struct
     let t = Types.CPU_info.t
 
+    let available_parallelism =
+      foreign "uv_available_parallelism"
+        (void @-> returning int)
+
     let cpu_info =
       foreign "uv_cpu_info"
         (ptr (ptr t) @-> ptr int @-> returning error_code)

src/c/luv_c_type_descriptions.ml

@@ -941,8 +941,8 @@ struct
     let t : ([ `Passwd ] structure) typ =
       typedef (structure "`Passwd") "uv_passwd_t"
     let username = field t "username" string
-    let uid = field t "uid" long
-    let gid = field t "gid" long
+    let uid = field t "uid" ulong
+    let gid = field t "gid" ulong
     let shell = field t "shell" string_opt
     let homedir = field t "homedir" string
     let () = seal t

src/c/shims.h

@@ -58,8 +58,8 @@
 
     typedef struct {
         char *username;
-        long uid;
-        long gid;
+        unsigned long uid;
+        unsigned long gid;
         char *shell;
         char *homedir;
     } uv_passwd_t;
@@ -655,3 +655,10 @@
         return ENOSYS;
     }
 #endif
+
+#if UV_VERSION_MAJOR == 1 && UV_VERSION_MINOR < 44
+    static int uv_available_parallelism()
+    {
+        return 1;
+    }
+#endif

src/c/vendor/configure/commit-hash

@@ -1 +1 @@
-988f2bfc4defb9a85a536a3e645834c161143ee0
+0c1fa696aa502eb749c2c4735005f41ba00a27b8