Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to latest Zig #1610

Merged
merged 73 commits into from
Dec 28, 2022
Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
72c8657
@min and @max
Jarred-Sumner Nov 29, 2022
b00d56a
builtins and some trivial ones
Jarred-Sumner Nov 29, 2022
0410789
Most of them
Jarred-Sumner Nov 29, 2022
6c4c424
more
Jarred-Sumner Nov 29, 2022
223515e
more!
Jarred-Sumner Nov 29, 2022
ddef776
More Progress
Jarred-Sumner Nov 29, 2022
8e81863
wip
Jarred-Sumner Nov 29, 2022
c6f38a9
Update tagged_pointer.zig
Jarred-Sumner Nov 29, 2022
0c482f6
Update http_client_async.zig
Jarred-Sumner Nov 29, 2022
a46f6db
Most of the iterable dir changes
Jarred-Sumner Nov 30, 2022
ebdab10
alright
Jarred-Sumner Nov 30, 2022
9c4c28e
Remove usages of deprecated formatters
Jarred-Sumner Nov 30, 2022
35424f2
:camera:
Jarred-Sumner Dec 8, 2022
c25950c
Merge branch 'main' into jarred/attempt-upgrade
Jarred-Sumner Dec 8, 2022
e58f769
fmt
Jarred-Sumner Dec 8, 2022
942ea16
Update shimmer.zig
Jarred-Sumner Dec 8, 2022
f89c55b
wip
Jarred-Sumner Dec 8, 2022
16f779c
wip
Jarred-Sumner Dec 8, 2022
77fcdac
wip
Jarred-Sumner Dec 8, 2022
7de388e
progress
Vexu Dec 19, 2022
8846e7f
more
Vexu Dec 19, 2022
19b0843
Merge branch 'main' into jarred/attempt-upgrade
Jarred-Sumner Dec 19, 2022
e007aa6
Merge branch 'main' into jarred/attempt-upgrade
Jarred-Sumner Dec 23, 2022
b48992c
Latest
Jarred-Sumner Dec 23, 2022
70ad718
stuck on error
Jarred-Sumner Dec 23, 2022
cb02d62
latest
Jarred-Sumner Dec 24, 2022
3acdfe3
Merge branch 'main' into jarred/attempt-upgrade
Jarred-Sumner Dec 24, 2022
9825aff
workaround stage2
Jarred-Sumner Dec 24, 2022
508f61b
wip
Jarred-Sumner Dec 24, 2022
12b5b7f
Update string_immutable.zig
Jarred-Sumner Dec 24, 2022
3368eed
wip
Jarred-Sumner Dec 25, 2022
26ec2ea
Migrate `Dirent` and `require("fs')` to use JSC<>Zig bindings
Jarred-Sumner Dec 25, 2022
2d7449d
Fix build errors
Jarred-Sumner Dec 25, 2022
b79ffac
Fixup most of the test failures
Jarred-Sumner Dec 25, 2022
52add73
Fix `make headers`
Jarred-Sumner Dec 26, 2022
a89029f
Fix "outside package path" error
Jarred-Sumner Dec 26, 2022
0341f91
Fixup aligned alloc
Jarred-Sumner Dec 26, 2022
0106b16
Add missing file
Jarred-Sumner Dec 26, 2022
45039a8
linux
Jarred-Sumner Dec 26, 2022
dd6b438
More linux fixes
Jarred-Sumner Dec 27, 2022
49c698e
use latest peechy
Jarred-Sumner Dec 27, 2022
ba7ae2d
Fix transpiler test failure
Jarred-Sumner Dec 27, 2022
407eeb2
Forgot about these
Jarred-Sumner Dec 27, 2022
d58d745
Fixup test failure
Jarred-Sumner Dec 27, 2022
40e3e67
Update node-timers.test.ts
Jarred-Sumner Dec 27, 2022
217771c
[node:htt] Fix `undefined is not an object` error
Jarred-Sumner Dec 27, 2022
dff7c69
Update http.exports.js
Jarred-Sumner Dec 27, 2022
259710b
Make this test less flaky
Jarred-Sumner Dec 27, 2022
07db129
fix hashes
Jarred-Sumner Dec 27, 2022
6ecd32c
Fix hex formatting and zls issues
Jarred-Sumner Dec 27, 2022
cda32d0
Download zig version
Jarred-Sumner Dec 27, 2022
da662ef
Update Dockerfile
Jarred-Sumner Dec 27, 2022
3138dde
Update Dockerfile
Jarred-Sumner Dec 27, 2022
12eb62f
Update uws
Jarred-Sumner Dec 27, 2022
d9d9158
Update Dockerfile
Jarred-Sumner Dec 27, 2022
f394462
Set llvm version
Jarred-Sumner Dec 27, 2022
c715c2e
Update README.md
Jarred-Sumner Dec 27, 2022
a1c78c3
Update uws
Jarred-Sumner Dec 27, 2022
b90c705
Update Dockerfile
Jarred-Sumner Dec 27, 2022
44d571d
Update io_linux.zig
Jarred-Sumner Dec 27, 2022
3a3a5f0
Update bun.zig
Jarred-Sumner Dec 27, 2022
d72a355
Log output
Jarred-Sumner Dec 27, 2022
4c504d9
workaround strange @cInclude error
Jarred-Sumner Dec 27, 2022
c5e03a1
Make ffi tests better
Jarred-Sumner Dec 27, 2022
a49f6af
Don't use cImport
Jarred-Sumner Dec 27, 2022
15ac345
Update c.zig
Jarred-Sumner Dec 27, 2022
edfc6b3
Update c-bindings.cpp
Jarred-Sumner Dec 27, 2022
2c39776
call setOutputDir
Jarred-Sumner Dec 27, 2022
5f33693
Update Dockerfile
Jarred-Sumner Dec 27, 2022
3180fa7
Use a longer name
Jarred-Sumner Dec 27, 2022
4f203c9
latest
Jarred-Sumner Dec 28, 2022
c8a9ab5
Merge branch 'main' into jarred/attempt-upgrade
Jarred-Sumner Dec 28, 2022
4bddb21
Update serve.test.ts
Jarred-Sumner Dec 28, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Most of them
Jarred-Sumner committed Nov 29, 2022
commit 0410789f2a30ae2d16b02ed7e4887d23d921cf5d
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -370,7 +370,7 @@ COPY ./src ${BUN_DIR}/src
COPY ./build.zig ${BUN_DIR}/build.zig
COPY ./completions ${BUN_DIR}/completions
COPY ./packages ${BUN_DIR}/packages
COPY ./build-id ${BUN_DIR}/build-id
COPY ./src/build-id ${BUN_DIR}/src/build-id
COPY ./package.json ${BUN_DIR}/package.json
COPY ./misctools ${BUN_DIR}/misctools
COPY Makefile ${BUN_DIR}/Makefile
@@ -408,14 +408,14 @@ ENV GIT_SHA=${GIT_SHA}
COPY --from=identifier_cache ${BUN_DIR}/src/js_lexer/*.blob ${BUN_DIR}/src/js_lexer/
COPY --from=node_fallbacks ${BUN_DIR}/src/node-fallbacks/out ${BUN_DIR}/src/node-fallbacks/out

COPY ./build-id ${BUN_DIR}/build-id
COPY ./src/build-id ${BUN_DIR}/src/build-id

ENV CCACHE_DIR=/ccache

RUN --mount=type=cache,target=/ccache cd $BUN_DIR && mkdir -p src/bun.js/bindings-obj && rm -rf $HOME/.cache zig-cache && make prerelease && \
mkdir -p $BUN_RELEASE_DIR && \
OUTPUT_DIR=/tmp $ZIG_PATH/zig build obj -Drelease-fast -Dtarget="${TRIPLET}" -Dcpu="${CPU_TARGET}" && \
cp /tmp/bun.o /tmp/bun-${BUN_BASE_VERSION}.$(cat ${BUN_DIR}/build-id).o && cd / && rm -rf $BUN_DIR
cp /tmp/bun.o /tmp/bun-${BUN_BASE_VERSION}.$(cat ${BUN_DIR}/src/build-id).o && cd / && rm -rf $BUN_DIR

FROM scratch as build_release_obj

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ DEBUG_PACKAGE_DIR = $(PACKAGES_REALPATH)/debug-$(PACKAGE_NAME)
RELEASE_BUN = $(PACKAGE_DIR)/bun
DEBUG_BIN = $(DEBUG_PACKAGE_DIR)/
DEBUG_BUN = $(DEBUG_BIN)/bun-debug
BUILD_ID = $(shell cat ./build-id)
BUILD_ID = $(shell cat ./src/build-id)
PACKAGE_JSON_VERSION = $(BUN_BASE_VERSION).$(BUILD_ID)
BUN_BUILD_TAG = bun-v$(PACKAGE_JSON_VERSION)
BUN_RELEASE_BIN = $(PACKAGE_DIR)/bun
25 changes: 12 additions & 13 deletions build.zig
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const std = @import("std");
const resolve_path = @import("./src/resolver/resolve_path.zig");

fn pkgPath(comptime out: []const u8) std.build.FileSource {
const outpath = comptime std.fs.path.dirname(@src().file).? ++ std.fs.path.sep_str ++ out;
@@ -344,7 +343,7 @@ pub fn build(b: *std.build.Builder) !void {
const headers_step = b.step("headers-obj", "Build JavaScriptCore headers");
var headers_obj: *std.build.LibExeObjStep = b.addObject("headers", "src/bindgen.zig");
defer headers_step.dependOn(&headers_obj.step);
try configureObjectStep(b, headers_obj, target, obj.main_pkg_path.?);
try configureObjectStep(b, headers_obj, @TypeOf(target), target, obj.main_pkg_path.?);
var headers_build_options = default_build_options;
headers_build_options.bindgen = true;
headers_obj.addOptions("build_options", default_build_options.step(b));
@@ -359,62 +358,62 @@ pub fn build(b: *std.build.Builder) !void {
// wasm_step.link_function_sections = true;
// wasm_step.link_emit_relocs = true;
// wasm_step.single_threaded = true;
try configureObjectStep(b, wasm_step, target, obj.main_pkg_path.?);
try configureObjectStep(b, wasm_step, @TypeOf(target), target, obj.main_pkg_path.?);
}

{
const headers_step = b.step("httpbench-obj", "Build HTTPBench tool (object files)");
var headers_obj: *std.build.LibExeObjStep = b.addObject("httpbench", "misctools/http_bench.zig");
defer headers_step.dependOn(&headers_obj.step);
try configureObjectStep(b, headers_obj, target, obj.main_pkg_path.?);
try configureObjectStep(b, headers_obj, @TypeOf(target), target, obj.main_pkg_path.?);
headers_obj.addOptions("build_options", default_build_options.step(b));
}

{
const headers_step = b.step("machbench-obj", "Build Machbench tool (object files)");
var headers_obj: *std.build.LibExeObjStep = b.addObject("machbench", "misctools/machbench.zig");
defer headers_step.dependOn(&headers_obj.step);
try configureObjectStep(b, headers_obj, target, obj.main_pkg_path.?);
try configureObjectStep(b, headers_obj, @TypeOf(target), target, obj.main_pkg_path.?);
headers_obj.addOptions("build_options", default_build_options.step(b));
}

{
const headers_step = b.step("fetch-obj", "Build fetch (object files)");
var headers_obj: *std.build.LibExeObjStep = b.addObject("fetch", "misctools/fetch.zig");
defer headers_step.dependOn(&headers_obj.step);
try configureObjectStep(b, headers_obj, target, obj.main_pkg_path.?);
try configureObjectStep(b, headers_obj, @TypeOf(target), target, obj.main_pkg_path.?);
headers_obj.addOptions("build_options", default_build_options.step(b));
}

{
const headers_step = b.step("string-bench", "Build string bench");
var headers_obj: *std.build.LibExeObjStep = b.addExecutable("string-bench", "src/bench/string-handling.zig");
defer headers_step.dependOn(&headers_obj.step);
try configureObjectStep(b, headers_obj, target, obj.main_pkg_path.?);
try configureObjectStep(b, headers_obj, @TypeOf(target), target, obj.main_pkg_path.?);
headers_obj.addOptions("build_options", default_build_options.step(b));
}

{
const headers_step = b.step("sha-bench-obj", "Build sha bench");
var headers_obj: *std.build.LibExeObjStep = b.addObject("sha", "src/sha.zig");
defer headers_step.dependOn(&headers_obj.step);
try configureObjectStep(b, headers_obj, target, obj.main_pkg_path.?);
try configureObjectStep(b, headers_obj, @TypeOf(target), target, obj.main_pkg_path.?);
headers_obj.addOptions("build_options", default_build_options.step(b));
}

{
const headers_step = b.step("vlq-bench", "Build vlq bench");
var headers_obj: *std.build.LibExeObjStep = b.addExecutable("vlq-bench", "src/sourcemap/vlq_bench.zig");
defer headers_step.dependOn(&headers_obj.step);
try configureObjectStep(b, headers_obj, target, obj.main_pkg_path.?);
try configureObjectStep(b, headers_obj, @TypeOf(target), target, obj.main_pkg_path.?);
headers_obj.addOptions("build_options", default_build_options.step(b));
}

{
const headers_step = b.step("tgz-obj", "Build tgz (object files)");
var headers_obj: *std.build.LibExeObjStep = b.addObject("tgz", "misctools/tgz.zig");
defer headers_step.dependOn(&headers_obj.step);
try configureObjectStep(b, headers_obj, target, obj.main_pkg_path.?);
try configureObjectStep(b, headers_obj, @TypeOf(target), target, obj.main_pkg_path.?);
headers_obj.addOptions("build_options", default_build_options.step(b));
}

@@ -432,7 +431,7 @@ pub fn build(b: *std.build.Builder) !void {
if (std.fs.path.dirname(test_bin)) |dir| headers_obj.setOutputDir(dir);
}

try configureObjectStep(b, headers_obj, target, obj.main_pkg_path.?);
try configureObjectStep(b, headers_obj, @TypeOf(target), target, obj.main_pkg_path.?);
try linkObjectFiles(b, headers_obj, target);

{
@@ -451,7 +450,7 @@ pub fn build(b: *std.build.Builder) !void {

test_.setMainPkgPath(obj.main_pkg_path.?);
test_.setTarget(target);
try configureObjectStep(b, test_, target, obj.main_pkg_path.?);
try configureObjectStep(b, test_, @TypeOf(target), target, obj.main_pkg_path.?);
try linkObjectFiles(b, test_, target);
test_.addOptions("build_options", default_build_options.step(b));

@@ -532,7 +531,7 @@ pub fn linkObjectFiles(b: *std.build.Builder, obj: *std.build.LibExeObjStep, tar
}
}

pub fn configureObjectStep(_: *std.build.Builder, obj: *std.build.LibExeObjStep, target: anytype, main_pkg_path: []const u8) !void {
pub fn configureObjectStep(_: *std.build.Builder, obj: *std.build.LibExeObjStep, comptime Target: type, target: Target, main_pkg_path: []const u8) !void {
obj.setMainPkgPath(main_pkg_path);

obj.setTarget(target);
2 changes: 1 addition & 1 deletion src/__global.zig
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ const Mimalloc = @import("bun").Mimalloc;

const BASE_VERSION = "0.3";

pub const build_id = std.fmt.parseInt(u64, std.mem.trim(u8, @embedFile("../build-id"), "\n \r\t"), 10) catch unreachable;
pub const build_id = std.fmt.parseInt(u64, std.mem.trim(u8, @embedFile("./build-id"), "\n \r\t"), 10) catch unreachable;
pub const package_json_version = if (Environment.isDebug)
std.fmt.comptimePrint(BASE_VERSION ++ ".{d}_debug", .{build_id})
else
2 changes: 1 addition & 1 deletion src/allocators.zig
Original file line number Diff line number Diff line change
@@ -451,7 +451,7 @@ pub fn BSSStringList(comptime _count: usize, comptime _item_length: usize) type
};
}

pub fn BSSMap(comptime ValueType: type, comptime count: anytype, store_keys: bool, estimated_key_length: usize, remove_trailing_slashes: bool) type {
pub fn BSSMap(comptime ValueType: type, comptime count: anytype, comptime store_keys: bool, comptime estimated_key_length: usize, comptime remove_trailing_slashes: bool) type {
const max_index = count - 1;
const BSSMapType = struct {
const Allocator = std.mem.Allocator;
File renamed without changes.
64 changes: 32 additions & 32 deletions src/bun.js/api/bun.zig
Original file line number Diff line number Diff line change
@@ -1304,7 +1304,7 @@ fn dump_mimalloc(
pub const Crypto = struct {
const Hashers = @import("../../sha.zig");

fn CryptoHasher(comptime Hasher: type, name: [:0]const u8) type {
fn CryptoHasher(comptime Hasher: type, comptime name: [:0]const u8) type {
return struct {
hashing: Hasher = Hasher{},

@@ -2596,11 +2596,11 @@ pub const Timer = struct {
pub const namespace = shim.namespace;

pub const Export = shim.exportFunctions(.{
.@"setTimeout" = setTimeout,
.@"setInterval" = setInterval,
.@"clearTimeout" = clearTimeout,
.@"clearInterval" = clearInterval,
.@"getNextID" = getNextID,
.setTimeout = setTimeout,
.setInterval = setInterval,
.clearTimeout = clearTimeout,
.clearInterval = clearInterval,
.getNextID = getNextID,
});

comptime {
@@ -2658,18 +2658,18 @@ pub const FFI = struct {
void,
.{ .name = "FFI", .has_dom_calls = true },
.{
.@"u8" = JSC.DOMCall("Reader", @This(), "u8", i32, JSC.DOMEffect.forRead(.World)),
.@"u16" = JSC.DOMCall("Reader", @This(), "u16", i32, JSC.DOMEffect.forRead(.World)),
.@"u32" = JSC.DOMCall("Reader", @This(), "u32", i32, JSC.DOMEffect.forRead(.World)),
.@"ptr" = JSC.DOMCall("Reader", @This(), "ptr", i52, JSC.DOMEffect.forRead(.World)),
.@"i8" = JSC.DOMCall("Reader", @This(), "i8", i32, JSC.DOMEffect.forRead(.World)),
.@"i16" = JSC.DOMCall("Reader", @This(), "i16", i32, JSC.DOMEffect.forRead(.World)),
.@"i32" = JSC.DOMCall("Reader", @This(), "i32", i32, JSC.DOMEffect.forRead(.World)),
.@"i64" = JSC.DOMCall("Reader", @This(), "i64", i64, JSC.DOMEffect.forRead(.World)),
.@"u64" = JSC.DOMCall("Reader", @This(), "u64", u64, JSC.DOMEffect.forRead(.World)),
.@"intptr" = JSC.DOMCall("Reader", @This(), "intptr", i52, JSC.DOMEffect.forRead(.World)),
.@"f32" = JSC.DOMCall("Reader", @This(), "f32", f64, JSC.DOMEffect.forRead(.World)),
.@"f64" = JSC.DOMCall("Reader", @This(), "f64", f64, JSC.DOMEffect.forRead(.World)),
.u8 = JSC.DOMCall("Reader", @This(), "u8", i32, JSC.DOMEffect.forRead(.World)),
.u16 = JSC.DOMCall("Reader", @This(), "u16", i32, JSC.DOMEffect.forRead(.World)),
.u32 = JSC.DOMCall("Reader", @This(), "u32", i32, JSC.DOMEffect.forRead(.World)),
.ptr = JSC.DOMCall("Reader", @This(), "ptr", i52, JSC.DOMEffect.forRead(.World)),
.i8 = JSC.DOMCall("Reader", @This(), "i8", i32, JSC.DOMEffect.forRead(.World)),
.i16 = JSC.DOMCall("Reader", @This(), "i16", i32, JSC.DOMEffect.forRead(.World)),
.i32 = JSC.DOMCall("Reader", @This(), "i32", i32, JSC.DOMEffect.forRead(.World)),
.i64 = JSC.DOMCall("Reader", @This(), "i64", i64, JSC.DOMEffect.forRead(.World)),
.u64 = JSC.DOMCall("Reader", @This(), "u64", u64, JSC.DOMEffect.forRead(.World)),
.intptr = JSC.DOMCall("Reader", @This(), "intptr", i52, JSC.DOMEffect.forRead(.World)),
.f32 = JSC.DOMCall("Reader", @This(), "f32", f64, JSC.DOMEffect.forRead(.World)),
.f64 = JSC.DOMCall("Reader", @This(), "f64", f64, JSC.DOMEffect.forRead(.World)),
},
.{},
);
@@ -2701,7 +2701,7 @@ pub const FFI = struct {
const value = @intToPtr(*align(1) u32, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"ptr"(
pub fn ptr(
_: *JSGlobalObject,
_: JSValue,
arguments: []const JSValue,
@@ -2737,7 +2737,7 @@ pub const FFI = struct {
const value = @intToPtr(*align(1) i32, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"intptr"(
pub fn intptr(
_: *JSGlobalObject,
_: JSValue,
arguments: []const JSValue,
@@ -2787,7 +2787,7 @@ pub const FFI = struct {
return JSValue.fromUInt64NoTruncate(global, value);
}

pub fn @"u8WithoutTypeChecks"(
pub fn u8WithoutTypeChecks(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2797,7 +2797,7 @@ pub const FFI = struct {
const value = @intToPtr(*align(1) u8, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"u16WithoutTypeChecks"(
pub fn u16WithoutTypeChecks(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2807,7 +2807,7 @@ pub const FFI = struct {
const value = @intToPtr(*align(1) u16, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"u32WithoutTypeChecks"(
pub fn u32WithoutTypeChecks(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2817,7 +2817,7 @@ pub const FFI = struct {
const value = @intToPtr(*align(1) u32, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"ptrWithoutTypeChecks"(
pub fn ptrWithoutTypeChecks(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2827,7 +2827,7 @@ pub const FFI = struct {
const value = @intToPtr(*align(1) u64, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"i8WithoutTypeChecks"(
pub fn i8WithoutTypeChecks(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2837,7 +2837,7 @@ pub const FFI = struct {
const value = @intToPtr(*align(1) i8, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"i16WithoutTypeChecks"(
pub fn i16WithoutTypeChecks(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2847,7 +2847,7 @@ pub const FFI = struct {
const value = @intToPtr(*align(1) i16, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"i32WithoutTypeChecks"(
pub fn i32WithoutTypeChecks(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2857,7 +2857,7 @@ pub const FFI = struct {
const value = @intToPtr(*align(1) i32, addr).*;
return JSValue.jsNumber(value);
}
pub fn @"intptrWithoutTypeChecks"(
pub fn intptrWithoutTypeChecks(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2868,7 +2868,7 @@ pub const FFI = struct {
return JSValue.jsNumber(value);
}

pub fn @"f32WithoutTypeChecks"(
pub fn f32WithoutTypeChecks(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2879,7 +2879,7 @@ pub const FFI = struct {
return JSValue.jsNumber(value);
}

pub fn @"f64WithoutTypeChecks"(
pub fn f64WithoutTypeChecks(
_: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2890,7 +2890,7 @@ pub const FFI = struct {
return JSValue.jsNumber(value);
}

pub fn @"u64WithoutTypeChecks"(
pub fn u64WithoutTypeChecks(
global: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
@@ -2901,7 +2901,7 @@ pub const FFI = struct {
return JSValue.fromUInt64NoTruncate(global, value);
}

pub fn @"i64WithoutTypeChecks"(
pub fn i64WithoutTypeChecks(
global: *JSGlobalObject,
_: *anyopaque,
raw_addr: i64,
4 changes: 2 additions & 2 deletions src/bun.js/api/bun/spawn.zig
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ pub const PosixSpawn = struct {
pub fn deinit(self: *Attr) void {
if (comptime bun.Environment.isMac) {
// https://github.com/ziglang/zig/issues/12964
system.posix_spawnattr_destroy(&self.attr);
_ = system.posix_spawnattr_destroy(&self.attr);
} else {
_ = system.posix_spawnattr_destroy(&self.attr);
}
@@ -93,7 +93,7 @@ pub const PosixSpawn = struct {
pub fn deinit(self: *Actions) void {
if (comptime bun.Environment.isMac) {
// https://github.com/ziglang/zig/issues/12964
system.posix_spawn_file_actions_destroy(&self.actions);
_ = system.posix_spawn_file_actions_destroy(&self.actions);
} else {
_ = system.posix_spawn_file_actions_destroy(&self.actions);
}
6 changes: 3 additions & 3 deletions src/bun.js/api/bun/subprocess.zig
Original file line number Diff line number Diff line change
@@ -1175,17 +1175,17 @@ pub const Subprocess = struct {
}

const stdin_pipe = if (stdio[0].isPiped()) os.pipe2(0) catch |err| {
globalThis.throw("failed to create stdin pipe: {s}", .{err});
globalThis.throw("failed to create stdin pipe: {s}", .{@errorName(err)});
return .zero;
} else undefined;

const stdout_pipe = if (stdio[1].isPiped()) os.pipe2(0) catch |err| {
globalThis.throw("failed to create stdout pipe: {s}", .{err});
globalThis.throw("failed to create stdout pipe: {s}", .{@errorName(err)});
return .zero;
} else undefined;

const stderr_pipe = if (stdio[2].isPiped()) os.pipe2(0) catch |err| {
globalThis.throw("failed to create stderr pipe: {s}", .{err});
globalThis.throw("failed to create stderr pipe: {s}", .{@errorName(err)});
return .zero;
} else undefined;

Loading
Oops, something went wrong.