aboutsummaryrefslogtreecommitdiff
path: root/src/bun.js
diff options
context:
space:
mode:
Diffstat (limited to 'src/bun.js')
-rw-r--r--src/bun.js/bindings/exports.zig3
-rw-r--r--src/bun.js/node/types.zig2
-rw-r--r--src/bun.js/test/jest.zig4
-rw-r--r--src/bun.js/webcore/body.zig2
-rw-r--r--src/bun.js/webcore/streams.zig14
5 files changed, 11 insertions, 14 deletions
diff --git a/src/bun.js/bindings/exports.zig b/src/bun.js/bindings/exports.zig
index ac19b4458..08d897590 100644
--- a/src/bun.js/bindings/exports.zig
+++ b/src/bun.js/bindings/exports.zig
@@ -1353,6 +1353,7 @@ pub const ZigConsoleClient = struct {
Set: void,
BigInt: void,
Symbol: void,
+ CustomFormattedObject: CustomFormattedObject,
GlobalObject: void,
Private: void,
Promise: void,
@@ -1364,8 +1365,6 @@ pub const ZigConsoleClient = struct {
Event: void,
Getter: void,
- CustomFormattedObject: CustomFormattedObject,
-
pub fn isPrimitive(this: @This()) bool {
return @as(Tag, this).isPrimitive();
}
diff --git a/src/bun.js/node/types.zig b/src/bun.js/node/types.zig
index 6f5f412c3..79fdf9e6b 100644
--- a/src/bun.js/node/types.zig
+++ b/src/bun.js/node/types.zig
@@ -1044,8 +1044,8 @@ pub fn modeFromJS(ctx: JSC.C.JSContextRef, value: JSC.JSValue, exception: JSC.C.
}
pub const PathOrFileDescriptor = union(Tag) {
- path: PathLike,
fd: bun.FileDescriptor,
+ path: PathLike,
pub const Tag = enum { fd, path };
diff --git a/src/bun.js/test/jest.zig b/src/bun.js/test/jest.zig
index 7e194f7c1..77cd79d21 100644
--- a/src/bun.js/test/jest.zig
+++ b/src/bun.js/test/jest.zig
@@ -1449,9 +1449,9 @@ pub const TestRunnerTask = struct {
};
pub const Result = union(TestRunner.Test.Status) {
- fail: u32,
- pass: u32, // assertion count
pending: void,
+ pass: u32, // assertion count
+ fail: u32,
skip: void,
todo: void,
fail_because_todo_passed: u32,
diff --git a/src/bun.js/webcore/body.zig b/src/bun.js/webcore/body.zig
index 86462dd04..2cf4de874 100644
--- a/src/bun.js/webcore/body.zig
+++ b/src/bun.js/webcore/body.zig
@@ -450,8 +450,8 @@ pub const Body = struct {
pub const Tag = enum {
Blob,
- InternalBlob,
WTFStringImpl,
+ InternalBlob,
// InlineBlob,
Locked,
Used,
diff --git a/src/bun.js/webcore/streams.zig b/src/bun.js/webcore/streams.zig
index 1301a7280..b3415c4f7 100644
--- a/src/bun.js/webcore/streams.zig
+++ b/src/bun.js/webcore/streams.zig
@@ -518,17 +518,15 @@ pub const DrainResult = union(enum) {
};
pub const StreamResult = union(Tag) {
+ pending: *Pending,
+ err: union(Err) { Error: Syscall.Error, JSValue: JSC.JSValue },
+ done: void,
owned: bun.ByteList,
owned_and_done: bun.ByteList,
temporary_and_done: bun.ByteList,
temporary: bun.ByteList,
into_array: IntoArray,
into_array_and_done: IntoArray,
- pending: *Pending,
-
- err: union(Err) { Error: Syscall.Error, JSValue: JSC.JSValue },
-
- done: void,
pub const Err = enum {
Error,
@@ -536,15 +534,15 @@ pub const StreamResult = union(Tag) {
};
pub const Tag = enum {
+ pending,
+ err,
+ done,
owned,
owned_and_done,
temporary_and_done,
temporary,
into_array,
into_array_and_done,
- pending,
- err,
- done,
};
pub fn slice(this: *const StreamResult) []const u8 {