diff --git a/haxe.opam b/haxe.opam index cdb3abc0bee..2ac471c4cf9 100644 --- a/haxe.opam +++ b/haxe.opam @@ -31,7 +31,7 @@ depends: [ "conf-libpcre2-8" "conf-zlib" "conf-neko" - "luv" {= "0.5.12"} + "luv" {>= "0.5.13"} "ipaddr" "terminal_size" ] diff --git a/src/macro/eval/evalLuv.ml b/src/macro/eval/evalLuv.ml index 12099b5f6b9..07aee9a3999 100644 --- a/src/macro/eval/evalLuv.ml +++ b/src/macro/eval/evalLuv.ml @@ -1942,7 +1942,7 @@ let fs_event_fields = [ ) events in encode_obj [ - key_file,vnative_string file; + key_file,encode_nullable vnative_string file; key_events,encode_array vevents; ] ) v4 @@ -2175,7 +2175,7 @@ let env_fields = [ let time_fields = [ "getTimeOfDay", vfun0 (fun() -> encode_result (fun (t:Time.t) -> - encode_obj [key_sec,VInt64 t.tv_sec; key_usec,vint32 t.tv_usec] + encode_obj [key_sec,VInt64 t.sec; key_usec,vint32 t.usec] ) (Time.gettimeofday()) ); "hrTime", vfun0 (fun() -> @@ -2292,10 +2292,10 @@ let resource_fields = [ encode_array_a [|vfloat m1; vfloat m5; vfloat m15|]; ); "freeMemory", vfun0 (fun() -> - VUInt64 (Resource.free_memory()) + encode_nullable (fun u -> VUInt64 u) (Resource.free_memory()) ); "totalMemory", vfun0 (fun() -> - VUInt64 (Resource.total_memory()) + encode_nullable (fun u -> VUInt64 u) (Resource.total_memory()) ); "constrainedMemory", vfun0 (fun() -> encode_nullable (fun u -> VUInt64 u) (Resource.constrained_memory()) diff --git a/std/eval/luv/FsEvent.hx b/std/eval/luv/FsEvent.hx index 5571138197f..5df6c3bf151 100644 --- a/std/eval/luv/FsEvent.hx +++ b/std/eval/luv/FsEvent.hx @@ -26,7 +26,7 @@ enum abstract FsEventFlag(Int) { /** Starts the handle and watches the given path for changes. **/ - public function start(path:NativeString, ?flags:Array, callback:(result:Result<{file:NativeString,events:Array}>)->Void):Void; + public function start(path:NativeString, ?flags:Array, callback:(result:Result<{file:Null,events:Array}>)->Void):Void; /** Stops the handle. diff --git a/std/eval/luv/Resource.hx b/std/eval/luv/Resource.hx index 5457e74f6ea..de70d5d1b78 100644 --- a/std/eval/luv/Resource.hx +++ b/std/eval/luv/Resource.hx @@ -40,13 +40,15 @@ extern class Resource { /** Evaluates to the amount of free memory, in bytes. + Returns `null` when unknown. **/ - static function freeMemory():UInt64; + static function freeMemory():Null; /** Evaluates to the total amount of memory, in bytes. + Returns `null` when unknown. **/ - static function totalMemory():UInt64; + static function totalMemory():Null; /** Gets the amount of memory available to the process (in bytes) based on