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.

Sign up for GitHub

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

WebKit upgrade #12246

Merged
merged 54 commits into from
Jul 2, 2024
Merged

WebKit upgrade #12246

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
3c9719c
Replace ZigString.toValue, ZigString.toValueAuto, ZigString.toValueGC…
Jarred-Sumner Jun 29, 2024
880b394
Update bindings.zig
Jarred-Sumner Jun 29, 2024
6b012ab
Update bindings.zig
Jarred-Sumner Jun 29, 2024
a1d49f9
WIP
Jarred-Sumner Jun 29, 2024
30288e3
so many changes
Jarred-Sumner Jun 29, 2024
7d2ab05
Almost odne
Jarred-Sumner Jun 29, 2024
dd53d29
alright it ocmpiled
Jarred-Sumner Jun 29, 2024
9f6d785
Fixup
Jarred-Sumner Jun 29, 2024
9ee7b3b
Bump
Jarred-Sumner Jun 29, 2024
44f8330
wip
Jarred-Sumner Jun 29, 2024
44ae3bb
Merge branch 'main' into jarred/zig-upgrade
Jarred-Sumner Jun 29, 2024
8b45d0d
Apply formatting changes
Jarred-Sumner Jun 29, 2024
43f416b
Update CMakeLists.txt
Jarred-Sumner Jun 29, 2024
352a15f
Bump
Jarred-Sumner Jun 30, 2024
cd71b5b
Apply formatting changes
Jarred-Sumner Jun 30, 2024
84d2380
Redo Asymmetric matchers
Jarred-Sumner Jun 30, 2024
4fdf03e
Add `bun run zig-check-windows` to check if windows passes sema
Jarred-Sumner Jun 30, 2024
01e423f
Mark more JSC.conv
Jarred-Sumner Jun 30, 2024
d744ce1
wrap everything
Jarred-Sumner Jun 30, 2024
368ccde
more
Jarred-Sumner Jun 30, 2024
074c84a
more conv
Jarred-Sumner Jun 30, 2024
72c933c
Update BunObject+exports.h
Jarred-Sumner Jun 30, 2024
6f0d912
Update base.zig
Jarred-Sumner Jun 30, 2024
d5419f9
move some files
Jarred-Sumner Jun 30, 2024
fa1c315
wip
Jarred-Sumner Jun 30, 2024
6461c4b
wip
Jarred-Sumner Jun 30, 2024
ab6601e
Move path into its own file
Jarred-Sumner Jun 30, 2024
697e9b7
It successfully compiled on Windows!
Jarred-Sumner Jun 30, 2024
e877d2d
wip
Jarred-Sumner Jul 1, 2024
53e3ce0
hm
Jarred-Sumner Jul 1, 2024
bed7243
wip
Jarred-Sumner Jul 1, 2024
1897e0f
Cmake
Jarred-Sumner Jul 1, 2024
0c7bfd4
Remove flag
Jarred-Sumner Jul 1, 2024
08c4b4e
cmake
Jarred-Sumner Jul 1, 2024
bf5872d
Some fixes
Jarred-Sumner Jul 1, 2024
59724ef
Update
Jarred-Sumner Jul 1, 2024
e003a90
Apply formatting changes
Jarred-Sumner Jul 1, 2024
fb9f7a5
Deflake fetch-gzip test on Windows
Jarred-Sumner Jul 1, 2024
5ddd623
Fix various things
Jarred-Sumner Jul 1, 2024
47e40f3
bump
Jarred-Sumner Jul 1, 2024
7aa72a7
Apply formatting changes
Jarred-Sumner Jul 1, 2024
05e3b9a
Remove the callconvs in most cases
Jarred-Sumner Jul 1, 2024
bfde2af
lots
Jarred-Sumner Jul 1, 2024
ed382e5
many
Jarred-Sumner Jul 1, 2024
3576965
Fix more tests
Jarred-Sumner Jul 1, 2024
e6cd552
increase timeout
Jarred-Sumner Jul 1, 2024
05e1f77
Get FFI to work again
Jarred-Sumner Jul 1, 2024
42f1fc3
Prettier logs
Jarred-Sumner Jul 2, 2024
89747d4
Fix rare race condition when starting HTTP thread
Jarred-Sumner Jul 2, 2024
3f8597b
Fix rare race condition when calling `Bun.file().{text,arrayBuffer,*}()`
Jarred-Sumner Jul 2, 2024
78bbf5b
Attempt to workaround https://github.com/ziglang/zig/issues/20472
Jarred-Sumner Jul 2, 2024
71ec236
Remove unnecessary callconv usages
Jarred-Sumner Jul 2, 2024
ec426f7
fixups
Jarred-Sumner Jul 2, 2024
3172062
1 more
Jarred-Sumner Jul 2, 2024
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
more conv
  • Loading branch information
@Jarred-Sumner
Jarred-Sumner committed Jun 30, 2024
commit 074c84a74d238fba971b97866aec0cae07fd16be
26 changes: 13 additions & 13 deletions src/bun.js/api/BunObject.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4121,7 +4121,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) u8, @ptrFromInt(addr)).*;
return JSValue.jsNumber(value);
Expand All @@ -4131,7 +4131,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) u16, @ptrFromInt(addr)).*;
return JSValue.jsNumber(value);
Expand All @@ -4141,7 +4141,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) u32, @ptrFromInt(addr)).*;
return JSValue.jsNumber(value);
Expand All @@ -4151,7 +4151,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) u64, @ptrFromInt(addr)).*;
return JSValue.jsNumber(value);
Expand All @@ -4161,7 +4161,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) i8, @ptrFromInt(addr)).*;
return JSValue.jsNumber(value);
Expand All @@ -4171,7 +4171,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) i16, @ptrFromInt(addr)).*;
return JSValue.jsNumber(value);
Expand All @@ -4181,7 +4181,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) i32, @ptrFromInt(addr)).*;
return JSValue.jsNumber(value);
Expand All @@ -4191,7 +4191,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) i64, @ptrFromInt(addr)).*;
return JSValue.jsNumber(value);
Expand All @@ -4202,7 +4202,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) f32, @ptrFromInt(addr)).*;
return JSValue.jsNumber(value);
Expand All @@ -4213,7 +4213,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) f64, @ptrFromInt(addr)).*;
return JSValue.jsNumber(value);
Expand All @@ -4224,7 +4224,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) u64, @ptrFromInt(addr)).*;
return JSValue.fromUInt64NoTruncate(global, value);
Expand All @@ -4235,7 +4235,7 @@ pub const FFIObject = struct {
_: *anyopaque,
raw_addr: i64,
offset: i32,
) callconv(.C) JSValue {
) callconv(JSC.conv) JSValue {
const addr = @as(usize, @intCast(raw_addr)) + @as(usize, @intCast(offset));
const value = @as(*align(1) i64, @ptrFromInt(addr)).*;
return JSValue.fromInt64NoTruncate(global, value);
Expand Down Expand Up @@ -4755,7 +4755,7 @@ pub const JSZlib = struct {
pub usingnamespace @import("./bun/subprocess.zig");

const InternalTestingAPIs = struct {
pub fn BunInternalFunction__syntaxHighlighter(globalThis: *JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn BunInternalFunction__syntaxHighlighter(globalThis: *JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
const args = callframe.arguments(1);
if (args.len < 1) {
globalThis.throwNotEnoughArguments("code", 1, 0);
Expand Down
6 changes: 3 additions & 3 deletions src/bun.js/api/Timer.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ pub const TimerObject = struct {
return .{ timer, timer_js };
}

pub fn doRef(this: *TimerObject, _: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn doRef(this: *TimerObject, _: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
const this_value = callframe.this();
this_value.ensureStillAlive();

Expand All @@ -564,7 +564,7 @@ pub const TimerObject = struct {
return this_value;
}

pub fn doRefresh(this: *TimerObject, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn doRefresh(this: *TimerObject, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
const this_value = callframe.this();

// setImmediate does not support refreshing and we do not support refreshing after cleanup
Expand All @@ -578,7 +578,7 @@ pub const TimerObject = struct {
return this_value;
}

pub fn doUnref(this: *TimerObject, _: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn doUnref(this: *TimerObject, _: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
const this_value = callframe.this();
this_value.ensureStillAlive();

Expand Down
16 changes: 8 additions & 8 deletions src/bun.js/api/brotli.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ pub const BrotliEncoder = struct {
}
};

pub fn encode(this: *BrotliEncoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSC.JSValue {
pub fn encode(this: *BrotliEncoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSC.JSValue {
const arguments = callframe.arguments(3);

if (arguments.len < 2) {
Expand Down Expand Up @@ -262,7 +262,7 @@ pub const BrotliEncoder = struct {
return .undefined;
}

pub fn encodeSync(this: *BrotliEncoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSC.JSValue {
pub fn encodeSync(this: *BrotliEncoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSC.JSValue {
const arguments = callframe.arguments(3);

if (arguments.len < 2) {
Expand Down Expand Up @@ -303,15 +303,15 @@ pub const BrotliEncoder = struct {
return if (!is_last and this.output.items.len == 0) .undefined else this.collectOutputValue();
}

pub fn end(this: *BrotliEncoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSC.JSValue {
pub fn end(this: *BrotliEncoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSC.JSValue {
_ = this;
_ = globalThis;
_ = callframe;

return .zero;
}

pub fn endSync(this: *BrotliEncoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSC.JSValue {
pub fn endSync(this: *BrotliEncoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSC.JSValue {
_ = this;
_ = globalThis;
_ = callframe;
Expand Down Expand Up @@ -444,7 +444,7 @@ pub const BrotliDecoder = struct {
this.freelist.discard(to_free.len);
}

pub fn decode(this: *BrotliDecoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSC.JSValue {
pub fn decode(this: *BrotliDecoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSC.JSValue {
const arguments = callframe.arguments(3);

if (arguments.len < 2) {
Expand Down Expand Up @@ -486,7 +486,7 @@ pub const BrotliDecoder = struct {
return .undefined;
}

pub fn decodeSync(this: *BrotliDecoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSC.JSValue {
pub fn decodeSync(this: *BrotliDecoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSC.JSValue {
const arguments = callframe.arguments(3);

if (arguments.len < 2) {
Expand Down Expand Up @@ -603,15 +603,15 @@ pub const BrotliDecoder = struct {
}
};

pub fn end(this: *BrotliDecoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSC.JSValue {
pub fn end(this: *BrotliDecoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSC.JSValue {
_ = this;
_ = globalThis;
_ = callframe;

return .zero;
}

pub fn endSync(this: *BrotliDecoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSC.JSValue {
pub fn endSync(this: *BrotliDecoder, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSC.JSValue {
_ = this;
_ = globalThis;
_ = callframe;
Expand Down
28 changes: 14 additions & 14 deletions src/bun.js/api/bun/h2_frame_parser.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,7 @@ pub const H2FrameParser = struct {
}
}

pub fn setEncoding(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn setEncoding(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(1);
if (args_list.len < 1) {
Expand Down Expand Up @@ -1532,7 +1532,7 @@ pub const H2FrameParser = struct {
return true;
}

pub fn updateSettings(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn updateSettings(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(1);
if (args_list.len < 1) {
Expand Down Expand Up @@ -1568,7 +1568,7 @@ pub const H2FrameParser = struct {
result.put(globalObject, JSC.ZigString.static("outboundQueueSize"), JSC.JSValue.jsNumber(0));
return result;
}
pub fn goaway(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn goaway(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(3);
if (args_list.len < 1) {
Expand Down Expand Up @@ -1618,7 +1618,7 @@ pub const H2FrameParser = struct {
return JSC.JSValue.jsUndefined();
}

pub fn ping(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn ping(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(1);
if (args_list.len < 1) {
Expand All @@ -1636,7 +1636,7 @@ pub const H2FrameParser = struct {
return .zero;
}

pub fn getEndAfterHeaders(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn getEndAfterHeaders(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(1);
if (args_list.len < 1) {
Expand Down Expand Up @@ -1664,7 +1664,7 @@ pub const H2FrameParser = struct {
return JSC.JSValue.jsBoolean(stream.endAfterHeaders);
}

pub fn setEndAfterHeaders(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn setEndAfterHeaders(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(2);
if (args_list.len < 2) {
Expand Down Expand Up @@ -1698,7 +1698,7 @@ pub const H2FrameParser = struct {
return JSC.JSValue.jsBoolean(true);
}

pub fn isStreamAborted(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn isStreamAborted(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(1);
if (args_list.len < 1) {
Expand Down Expand Up @@ -1728,7 +1728,7 @@ pub const H2FrameParser = struct {
}
return JSC.JSValue.jsBoolean(true);
}
pub fn getStreamState(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn getStreamState(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(1);
if (args_list.len < 1) {
Expand Down Expand Up @@ -1765,7 +1765,7 @@ pub const H2FrameParser = struct {
return state;
}

pub fn setStreamPriority(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn setStreamPriority(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(2);
if (args_list.len < 2) {
Expand Down Expand Up @@ -1859,7 +1859,7 @@ pub const H2FrameParser = struct {
}
return JSC.JSValue.jsBoolean(true);
}
pub fn rstStream(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn rstStream(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(2);
if (args_list.len < 2) {
Expand Down Expand Up @@ -1938,7 +1938,7 @@ pub const H2FrameParser = struct {
}
}

pub fn sendTrailers(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn sendTrailers(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(3);
if (args_list.len < 3) {
Expand Down Expand Up @@ -2077,7 +2077,7 @@ pub const H2FrameParser = struct {

return JSC.JSValue.jsUndefined();
}
pub fn writeStream(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn writeStream(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(3);
if (args_list.len < 3) {
Expand Down Expand Up @@ -2147,7 +2147,7 @@ pub const H2FrameParser = struct {
return stream_id;
}

pub fn request(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn request(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
// we use PADDING_STRATEGY_NONE with is default
// TODO: PADDING_STRATEGY_MAX AND PADDING_STRATEGY_ALIGNED
Expand Down Expand Up @@ -2423,7 +2423,7 @@ pub const H2FrameParser = struct {
return JSC.JSValue.jsNumber(stream.id);
}

pub fn read(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn read(this: *H2FrameParser, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
JSC.markBinding(@src());
const args_list = callframe.arguments(1);
if (args_list.len < 1) {
Expand Down
8 changes: 4 additions & 4 deletions src/bun.js/api/bun/socket.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ pub const Listener = struct {
}
};

pub fn reload(this: *Listener, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn reload(this: *Listener, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
const args = callframe.arguments(1);

if (args.len < 1 or (this.listener == null and this.handlers.active_connections == 0)) {
Expand Down Expand Up @@ -874,7 +874,7 @@ pub const Listener = struct {
return JSValue.jsUndefined();
}

pub fn stop(this: *Listener, _: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn stop(this: *Listener, _: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
const arguments = callframe.arguments(1);
log("close", .{});

Expand Down Expand Up @@ -966,7 +966,7 @@ pub const Listener = struct {
return JSValue.jsNumber(this.connection.host.port);
}

pub fn ref(this: *Listener, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn ref(this: *Listener, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
const this_value = callframe.this();
if (this.listener == null) return JSValue.jsUndefined();
this.poll_ref.ref(globalObject.bunVM());
Expand Down Expand Up @@ -2130,7 +2130,7 @@ fn NewSocket(comptime ssl: bool) type {
}
}

pub fn reload(this: *This, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn reload(this: *This, globalObject: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
const args = callframe.arguments(1);

if (args.len < 1) {
Expand Down
4 changes: 2 additions & 2 deletions src/bun.js/api/filesystem_router.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ pub const FileSystemRouter = struct {
return fs_router;
}

pub fn reload(this: *FileSystemRouter, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn reload(this: *FileSystemRouter, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
const this_value = callframe.this();

var arena = globalThis.allocator().create(bun.ArenaAllocator) catch unreachable;
Expand Down Expand Up @@ -259,7 +259,7 @@ pub const FileSystemRouter = struct {
return this_value;
}

pub fn match(this: *FileSystemRouter, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue {
pub fn match(this: *FileSystemRouter, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(JSC.conv) JSValue {
const argument_ = callframe.arguments(2);
if (argument_.len == 0) {
globalThis.throwInvalidArguments("Expected string, Request or Response", .{});
Expand Down
Loading
Loading