diff options
| author |  Jarred Sumner <jarred@jarredsumner.com>
| 2022-12-28 00:51:22 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-12-28 00:51:22 -0800 |
| commit | c0dd2841362b67fdb5ede262b19688004a4eb9a4 (patch) | |
| tree | a3cd6b353c25c30d66489de61b394af7d5568fed /src/watcher.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/watcher.zig')
| -rw-r--r-- | src/watcher.zig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/watcher.zig b/src/watcher.zig index a1c65bb77..2a20c0db3 100644 --- a/src/watcher.zig +++ b/src/watcher.zig @@ -436,7 +436,7 @@ pub fn NewWatcher(comptime ContextType: type) type { null, ); - var changes = changelist[0..@intCast(usize, @maximum(0, count_))]; + var changes = changelist[0..@intCast(usize, @max(0, count_))]; var watchevents = this.watch_events[0..changes.len]; for (changes) |event, i| { watchevents[i].fromKEvent(event); @@ -464,7 +464,7 @@ pub fn NewWatcher(comptime ContextType: type) type { const eventlist_index = this.watchlist.items(.eventlist_index); while (remaining_events > 0) { - const slice = events[0..@minimum(remaining_events, this.watch_events.len)]; + const slice = events[0..@min(remaining_events, this.watch_events.len)]; var watchevents = this.watch_events[0..slice.len]; var watch_event_id: u32 = 0; for (slice) |event| { @@ -643,8 +643,8 @@ pub fn NewWatcher(comptime ContextType: type) type { const fd = brk: { if (fd_ > 0) break :brk fd_; - const dir = try std.fs.openDirAbsolute(file_path, .{ .iterate = true }); - break :brk @truncate(StoredFileDescriptorType, dir.fd); + const dir = try std.fs.cwd().openIterableDir(file_path, .{}); + break :brk @truncate(StoredFileDescriptorType, dir.dir.fd); }; const parent_hash = Watcher.getHash(Fs.PathName.init(file_path).dirWithTrailingSlash()); |