diff options
author | 2022-12-28 00:51:22 -0800 | |
---|---|---|
committer | 2022-12-28 00:51:22 -0800 | |
commit | c0dd2841362b67fdb5ede262b19688004a4eb9a4 (patch) | |
tree | a3cd6b353c25c30d66489de61b394af7d5568fed /src/io/io_darwin.zig | |
parent | 504972fa5deb92f2d0510d42f11b085351915a32 (diff) | |
download | bun-c0dd2841362b67fdb5ede262b19688004a4eb9a4.tar.gz bun-c0dd2841362b67fdb5ede262b19688004a4eb9a4.tar.zst bun-c0dd2841362b67fdb5ede262b19688004a4eb9a4.zip |
Upgrade to latest Zig (#1610)
* @min and @max
* builtins and some trivial ones
* Most of them
* more
* more!
* More Progress
* wip
* Update tagged_pointer.zig
* Update http_client_async.zig
* Most of the iterable dir changes
* alright
* Remove usages of deprecated formatters
* :camera:
* fmt
* Update shimmer.zig
* wip
* wip
* wip
* progress
* more
* Latest
* stuck on error
* latest
* workaround stage2
* wip
* Update string_immutable.zig
* wip
* Migrate `Dirent` and `require("fs')` to use JSC<>Zig bindings
* Fix build errors
* Fixup most of the test failures
* Fix `make headers`
* Fix "outside package path" error
* Fixup aligned alloc
* Add missing file
* linux
* More linux fixes
* use latest peechy
* Fix transpiler test failure
* Forgot about these
* Fixup test failure
* Update node-timers.test.ts
* [node:htt] Fix `undefined is not an object` error
Fixes https://github.com/oven-sh/bun/issues/1618
* Update http.exports.js
* Make this test less flaky
* fix hashes
* Fix hex formatting and zls issues
* Download zig version
* Update Dockerfile
* Update Dockerfile
* Update uws
* Update Dockerfile
* Set llvm version
* Update README.md
* Update uws
* Update Dockerfile
* Update io_linux.zig
* Update bun.zig
* Log output
* workaround strange @cInclude error
* Make ffi tests better
* Don't use cImport
* Update c.zig
* Update c-bindings.cpp
* call setOutputDir
* Update Dockerfile
* Use a longer name
* latest
* Update serve.test.ts
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Co-authored-by: Veikka Tuominen <git@vexu.eu>
Diffstat (limited to 'src/io/io_darwin.zig')
-rw-r--r-- | src/io/io_darwin.zig | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/io/io_darwin.zig b/src/io/io_darwin.zig index 82570edd0..b9eb59815 100644 --- a/src/io/io_darwin.zig +++ b/src/io/io_darwin.zig @@ -860,7 +860,7 @@ fn flush_timeouts(self: *IO) ?u64 { const timeout_ns = expires - now; if (min_timeout) |min_ns| { - min_timeout = @minimum(min_ns, timeout_ns); + min_timeout = @min(min_ns, timeout_ns); } else { min_timeout = timeout_ns; } @@ -872,7 +872,7 @@ fn flush_timeouts(self: *IO) ?u64 { pub const Completion = struct { next: ?*Completion, context: ?*anyopaque, - callback: fn (*IO, *Completion) void, + callback: *const fn (*IO, *Completion) void, operation: Operation, }; @@ -1021,7 +1021,7 @@ pub fn event( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: void, @@ -1047,7 +1047,7 @@ pub fn nextTick( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: void, @@ -1070,7 +1070,7 @@ pub fn accept( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: AcceptError!os.socket_t, @@ -1125,7 +1125,7 @@ pub fn close( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: CloseError!void, @@ -1167,7 +1167,7 @@ pub fn connect( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: IO.ConnectError!void, @@ -1249,7 +1249,7 @@ pub fn fsync( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: FsyncError!void, @@ -1279,7 +1279,7 @@ pub fn open( _: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: OpenError!fd_t, @@ -1314,7 +1314,7 @@ pub fn read( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: ReadError!usize, @@ -1378,7 +1378,7 @@ pub fn recv( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: RecvError!usize, @@ -1435,7 +1435,7 @@ pub fn send( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: SendError!usize, @@ -1491,7 +1491,7 @@ pub fn timeout( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: TimeoutError!void, @@ -1519,7 +1519,7 @@ fn timeoutInternal( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: TimeoutError!void, @@ -1550,7 +1550,7 @@ pub fn write( self: *IO, comptime Context: type, context: Context, - comptime callback: fn ( + comptime callback: *const fn ( context: Context, completion: *Completion, result: WriteError!usize, @@ -1605,7 +1605,7 @@ fn buffer_limit(buffer_len: usize) usize { .macos, .ios, .watchos, .tvos => std.math.maxInt(i32), else => std.math.maxInt(isize), }; - return @minimum(limit, buffer_len); + return @min(limit, buffer_len); } pub var global: IO = undefined; |