diff options
author | 2023-04-14 03:58:38 -0700 | |
---|---|---|
committer | 2023-04-14 03:58:38 -0700 | |
commit | f6a4516d667f7cf000fb2e3123d29079a5ced272 (patch) | |
tree | 4f108bdbd550f6bc05e5e06814c8b271e8ce8d13 /src/bun.js | |
parent | 6c69c2b36462100792bb3d1b23aba8afbee0253f (diff) | |
download | bun-f6a4516d667f7cf000fb2e3123d29079a5ced272.tar.gz bun-f6a4516d667f7cf000fb2e3123d29079a5ced272.tar.zst bun-f6a4516d667f7cf000fb2e3123d29079a5ced272.zip |
Upgrade Zig (#2656)
* Upgrade Zig
* Don't add `d` files in github actions
* Revert "Don't add `d` files in github actions"
This reverts commit 446e2dd6743da08ec4136233fdc9179dbbf58fca.
---------
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Diffstat (limited to 'src/bun.js')
-rw-r--r-- | src/bun.js/bindings/header-gen.zig | 6 | ||||
-rw-r--r-- | src/bun.js/bindings/headers-cpp.h | 2 | ||||
-rw-r--r-- | src/bun.js/bindings/headers.h | 2 | ||||
-rw-r--r-- | src/bun.js/bindings/static_export.zig | 2 | ||||
-rw-r--r-- | src/bun.js/javascript.zig | 1 | ||||
-rw-r--r-- | src/bun.js/module_loader.zig | 1 | ||||
-rw-r--r-- | src/bun.js/webcore/streams.zig | 8 |
7 files changed, 10 insertions, 12 deletions
diff --git a/src/bun.js/bindings/header-gen.zig b/src/bun.js/bindings/header-gen.zig index 179c884d5..cb1629de7 100644 --- a/src/bun.js/bindings/header-gen.zig +++ b/src/bun.js/bindings/header-gen.zig @@ -23,9 +23,9 @@ const ENABLE_REWRITE_RETURN = false; pub fn cTypeLabel(comptime Type: type) ?[]const u8 { return switch (comptime Type) { - *StaticExport.c_char => "char*", - [*c]u8, *const StaticExport.c_char => "const char*", - StaticExport.c_char => "char", + *c_char => "char*", + [*c]u8, *const c_char => "const char*", + c_char => "char", *void => "void", bool => "bool", usize => "size_t", diff --git a/src/bun.js/bindings/headers-cpp.h b/src/bun.js/bindings/headers-cpp.h index 2b9349144..f90e2f0d9 100644 --- a/src/bun.js/bindings/headers-cpp.h +++ b/src/bun.js/bindings/headers-cpp.h @@ -1,4 +1,4 @@ -//-- AUTOGENERATED FILE -- 1681365101 +//-- AUTOGENERATED FILE -- 1681462444 // clang-format off #pragma once diff --git a/src/bun.js/bindings/headers.h b/src/bun.js/bindings/headers.h index fbf902a8a..b547edc44 100644 --- a/src/bun.js/bindings/headers.h +++ b/src/bun.js/bindings/headers.h @@ -1,5 +1,5 @@ // clang-format off -//-- AUTOGENERATED FILE -- 1681365101 +//-- AUTOGENERATED FILE -- 1681462444 #pragma once #include <stddef.h> diff --git a/src/bun.js/bindings/static_export.zig b/src/bun.js/bindings/static_export.zig index a3d47e56e..2a5189210 100644 --- a/src/bun.js/bindings/static_export.zig +++ b/src/bun.js/bindings/static_export.zig @@ -12,5 +12,3 @@ pub fn Decl(comptime this: *const @This()) std.builtin.Type.Declaration { pub fn wrappedName(comptime this: *const @This()) []const u8 { return comptime "wrap" ++ this.symbol_name; } - -pub const c_char = enum(u8) { _ }; diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig index 3b8b8903e..3616e174d 100644 --- a/src/bun.js/javascript.zig +++ b/src/bun.js/javascript.zig @@ -1,7 +1,6 @@ const std = @import("std"); const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false; const StaticExport = @import("./bindings/static_export.zig"); -const c_char = StaticExport.c_char; const bun = @import("bun"); const string = bun.string; const Output = bun.Output; diff --git a/src/bun.js/module_loader.zig b/src/bun.js/module_loader.zig index 85bc04f53..9ec142176 100644 --- a/src/bun.js/module_loader.zig +++ b/src/bun.js/module_loader.zig @@ -1,7 +1,6 @@ const std = @import("std"); const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false; const StaticExport = @import("./bindings/static_export.zig"); -const c_char = StaticExport.c_char; const bun = @import("bun"); const string = bun.string; const Output = bun.Output; diff --git a/src/bun.js/webcore/streams.zig b/src/bun.js/webcore/streams.zig index 91215886d..e73c34b5e 100644 --- a/src/bun.js/webcore/streams.zig +++ b/src/bun.js/webcore/streams.zig @@ -2155,7 +2155,7 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type { } defer { - if (comptime @hasField(SinkType, "done") and this.sink.done) { + if ((comptime @hasField(SinkType, "done")) and this.sink.done) { callframe.this().unprotect(); } } @@ -2216,8 +2216,10 @@ pub fn NewJSSink(comptime SinkType: type, comptime name_: []const u8) type { } defer { - if (comptime @hasField(SinkType, "done") and this.sink.done) { - callframe.this().unprotect(); + if (comptime @hasField(SinkType, "done")) { + if (this.sink.done) { + callframe.this().unprotect(); + } } } |