diff --git a/src/bun.js/bindings/bindings.cpp b/src/bun.js/bindings/bindings.cpp index 7ca2bfebd5..a6db5f03b0 100644 --- a/src/bun.js/bindings/bindings.cpp +++ b/src/bun.js/bindings/bindings.cpp @@ -2560,7 +2560,6 @@ void JSC__JSValue___then(JSC::EncodedJSValue JSValue0, JSC::JSGlobalObject* arg1 } } - void JSC__JSGlobalObject__deleteModuleRegistryEntry(JSC::JSGlobalObject* global, const BunString* arg1) { auto& vm = global->vm(); @@ -2774,7 +2773,6 @@ JSC::EncodedJSValue JSC__JSValue__getDirectIndex(JSC::EncodedJSValue jsValue, JS return JSC::JSValue::encode(object->getDirectIndex(arg1, arg3)); } - #pragma mark - JSC::JSCell JSC::JSObject* JSC__JSCell__getObject(JSC::JSCell* arg0) @@ -2887,7 +2885,6 @@ JSC::EncodedJSValue JSC__JSModuleLoader__evaluate(JSC::JSGlobalObject* globalObj return JSValue::encode(usedStream); } - JSC::EncodedJSValue JSC__JSValue__fromEntries(JSC::JSGlobalObject* globalObject, const BunString* keys, const BunString* values, size_t initialCapacity) { diff --git a/src/bun.js/bindings/headers-handwritten.h b/src/bun.js/bindings/headers-handwritten.h index d8f94b706c..9edc92da6b 100644 --- a/src/bun.js/bindings/headers-handwritten.h +++ b/src/bun.js/bindings/headers-handwritten.h @@ -344,7 +344,6 @@ extern "C" const char* Bun__userAgent; extern "C" ZigErrorCode Zig_ErrorCodeParserError; - extern "C" bool Bun__transpileVirtualModule( JSC::JSGlobalObject* global, const BunString* specifier, diff --git a/src/bun.js/bindings/helpers.h b/src/bun.js/bindings/helpers.h index dbc9b25ef4..aaea73bb6f 100644 --- a/src/bun.js/bindings/helpers.h +++ b/src/bun.js/bindings/helpers.h @@ -118,7 +118,6 @@ static const WTF::String toString(ZigStringView str) { reinterpret_cast(untag(str.ptr)), str.len })); } - static const WTF::String toString(ZigStringView str, StringPointer ptr) { if (str.len == 0 || str.ptr == nullptr || ptr.len == 0) { @@ -270,7 +269,6 @@ static void throwException(JSC::ThrowScope& scope, ZigErrorType err, JSC::JSGlob JSC::Exception::create(global->vm(), JSC::JSValue::decode(err.value))); } - static const WTF::String toStringStatic(ZigStringView str) { if (str.len == 0 || str.ptr == nullptr) { @@ -290,7 +288,6 @@ static const WTF::String toStringStatic(ZigStringView str) return WTF::String(ascii); } - }; // namespace Zig JSC::JSValue createSystemError(JSC::JSGlobalObject* global, ASCIILiteral message, ASCIILiteral syscall, int err); diff --git a/src/bun.js/node/node_cluster_binding.zig b/src/bun.js/node/node_cluster_binding.zig index 24bfa6e924..6747a89ba6 100644 --- a/src/bun.js/node/node_cluster_binding.zig +++ b/src/bun.js/node/node_cluster_binding.zig @@ -299,5 +299,4 @@ const std = @import("std"); const bun = @import("bun"); const Environment = bun.Environment; const Output = bun.Output; - const jsc = bun.jsc; diff --git a/src/bun.js/node/node_util_binding.zig b/src/bun.js/node/node_util_binding.zig index a6ada7512c..4ce0c7db8b 100644 --- a/src/bun.js/node/node_util_binding.zig +++ b/src/bun.js/node/node_util_binding.zig @@ -227,10 +227,10 @@ pub fn parseEnv(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame) bun. const string = []const u8; -const bun = @import("bun"); const envloader = @import("../../env_loader.zig"); const std = @import("std"); const validators = @import("./util/validators.zig"); const Allocator = std.mem.Allocator; +const bun = @import("bun"); const jsc = bun.jsc; diff --git a/src/bun.js/node/node_zlib_binding.zig b/src/bun.js/node/node_zlib_binding.zig index de3160d66b..66a82df486 100644 --- a/src/bun.js/node/node_zlib_binding.zig +++ b/src/bun.js/node/node_zlib_binding.zig @@ -334,6 +334,5 @@ const std = @import("std"); const bun = @import("bun"); const Output = bun.Output; -const Buffer = bun.api.node.Buffer; - const jsc = bun.jsc; +const Buffer = bun.api.node.Buffer; diff --git a/src/bun.js/test/expect/toHaveProperty.zig b/src/bun.js/test/expect/toHaveProperty.zig index 62565fa5c3..418aa2486e 100644 --- a/src/bun.js/test/expect/toHaveProperty.zig +++ b/src/bun.js/test/expect/toHaveProperty.zig @@ -86,9 +86,8 @@ pub fn toHaveProperty(this: *Expect, globalThis: *JSGlobalObject, callFrame: *Ca return this.throw(globalThis, signature, "\n\nExpected path: {f}\n\nUnable to find property\n", .{expected_property_path.toFmt(&formatter)}); } -const DiffFormatter = @import("../diff_format.zig").DiffFormatter; - const bun = @import("bun"); +const DiffFormatter = @import("../diff_format.zig").DiffFormatter; const jsc = bun.jsc; const CallFrame = bun.jsc.CallFrame; diff --git a/src/bun.js/webcore.zig b/src/bun.js/webcore.zig index 02fee766c8..bb9caf71d5 100644 --- a/src/bun.js/webcore.zig +++ b/src/bun.js/webcore.zig @@ -117,12 +117,10 @@ pub const Lifetime = enum { temporary, }; +const bun = @import("bun"); const std = @import("std"); const WebSocketClient = @import("../http/websocket_http_client.zig").WebSocketClient; const WebSocketClientTLS = @import("../http/websocket_http_client.zig").WebSocketClientTLS; const WebSocketHTTPClient = @import("../http/websocket_http_client.zig").WebSocketHTTPClient; const WebSocketHTTPSClient = @import("../http/websocket_http_client.zig").WebSocketHTTPSClient; - -const bun = @import("bun"); -const jsc = bun.jsc; diff --git a/src/http/AsyncHTTP.zig b/src/http/AsyncHTTP.zig index af14ba8153..0bb51283ae 100644 --- a/src/http/AsyncHTTP.zig +++ b/src/http/AsyncHTTP.zig @@ -473,7 +473,6 @@ const Environment = bun.Environment; const FeatureFlags = bun.FeatureFlags; const MutableString = bun.MutableString; const assert = bun.assert; -const jsc = bun.jsc; const picohttp = bun.picohttp; const Channel = bun.threading.Channel; const SSLConfig = bun.api.server.ServerConfig.SSLConfig; diff --git a/src/string.zig b/src/string.zig index 020dad85b8..258274c97d 100644 --- a/src/string.zig +++ b/src/string.zig @@ -1781,8 +1781,8 @@ const std = @import("std"); const bun = @import("bun"); const JSError = bun.JSError; -const OOM = bun.OOM; const NullableAllocator = bun.NullableAllocator; +const OOM = bun.OOM; const AsciiStatus = bun.strings.AsciiStatus; const jsc = bun.jsc; diff --git a/src/string/wtf.zig b/src/string/wtf.zig index 0bfbe3ed46..9614dbdad9 100644 --- a/src/string/wtf.zig +++ b/src/string/wtf.zig @@ -267,8 +267,8 @@ pub const StringImplAllocator = struct { pub const VTablePtr = &VTable; }; -const bun = @import("bun"); const std = @import("std"); +const bun = @import("bun"); const jsc = bun.jsc; const StringView = bun.string.StringView; diff --git a/src/valkey/ValkeyCommand.zig b/src/valkey/ValkeyCommand.zig index 4b365de5a3..a6761a5990 100644 --- a/src/valkey/ValkeyCommand.zig +++ b/src/valkey/ValkeyCommand.zig @@ -166,5 +166,5 @@ const std = @import("std"); const bun = @import("bun"); const JSError = bun.JSError; const jsc = bun.jsc; -const node = bun.api.node; const Slice = bun.String.Slice; +const node = bun.api.node; diff --git a/src/valkey/js_valkey_functions.zig b/src/valkey/js_valkey_functions.zig index c6837314a0..2c5f7e4617 100644 --- a/src/valkey/js_valkey_functions.zig +++ b/src/valkey/js_valkey_functions.zig @@ -1583,16 +1583,17 @@ fn fromJS(globalObject: *jsc.JSGlobalObject, value: JSValue) !?JSArgument { return try JSArgument.fromJSMaybeFile(globalObject, bun.default_allocator, value, false); } -const bun = @import("bun"); const std = @import("std"); const JSValkeyClient = @import("./js_valkey.zig").JSValkeyClient; const SubscriptionCtx = @import("./js_valkey.zig").SubscriptionCtx; +const bun = @import("bun"); +const Slice = bun.String.Slice; + const jsc = bun.jsc; const JSValue = jsc.JSValue; const JSArgument = jsc.Node.BlobOrStringOrBuffer; -const Slice = bun.String.Slice; const valkey = bun.valkey; const Command = valkey.Command; diff --git a/test/internal/ban-limits.json b/test/internal/ban-limits.json index 4219d0eb41..e9bd1fda1a 100644 --- a/test/internal/ban-limits.json +++ b/test/internal/ban-limits.json @@ -24,7 +24,7 @@ "allocator.ptr ==": 0, "global.hasException": 28, "globalObject.hasException": 47, - "globalThis.hasException": 123, + "globalThis.hasException": 122, "std.StringArrayHashMap(": 1, "std.StringArrayHashMapUnmanaged(": 11, "std.StringHashMap(": 0,