aboutsummaryrefslogtreecommitdiff
path: root/src/bun.js/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/bun.js/api')
-rw-r--r--src/bun.js/api/bun.zig14
-rw-r--r--src/bun.js/api/bun/socket.zig2
-rw-r--r--src/bun.js/api/bun/spawn.zig4
-rw-r--r--src/bun.js/api/bun/subprocess.zig3
-rw-r--r--src/bun.js/api/ffi.zig66
-rw-r--r--src/bun.js/api/filesystem_router.zig4
-rw-r--r--src/bun.js/api/transpiler.zig2
7 files changed, 49 insertions, 46 deletions
diff --git a/src/bun.js/api/bun.zig b/src/bun.js/api/bun.zig
index 78927f85a..fd91ef897 100644
--- a/src/bun.js/api/bun.zig
+++ b/src/bun.js/api/bun.zig
@@ -456,7 +456,7 @@ pub fn getArgv(
var allocator = argv_list.get();
var argv = allocator.alloc(ZigString, std.os.argv.len) catch unreachable;
defer if (argv.len > 128) allocator.free(argv);
- for (std.os.argv) |arg, i| {
+ for (std.os.argv, 0..) |arg, i| {
argv[i] = ZigString.init(std.mem.span(arg));
}
@@ -504,7 +504,7 @@ pub fn getFilePath(ctx: js.JSContextRef, arguments: []const js.JSValueRef, buf:
var temp_strings_list: [32]string = undefined;
var temp_strings_list_len: u8 = 0;
defer {
- for (temp_strings_list[0..temp_strings_list_len]) |_, i| {
+ for (temp_strings_list[0..temp_strings_list_len], 0..) |_, i| {
temp_strings_list[i] = "";
}
}
@@ -680,7 +680,7 @@ pub fn getRouteFiles(
const router = &VirtualMachine.get().bundler.router.?;
const list = router.getPublicPaths() catch unreachable;
- for (routes_list_strings[0..@min(list.len, routes_list_strings.len)]) |_, i| {
+ for (routes_list_strings[0..@min(list.len, routes_list_strings.len)], 0..) |_, i| {
routes_list_strings[i] = ZigString.init(list[i]);
}
@@ -701,7 +701,7 @@ pub fn getRouteNames(
const router = &VirtualMachine.get().bundler.router.?;
const list = router.getNames() catch unreachable;
- for (routes_list_strings[0..@min(list.len, routes_list_strings.len)]) |_, i| {
+ for (routes_list_strings[0..@min(list.len, routes_list_strings.len)], 0..) |_, i| {
routes_list_strings[i] = ZigString.init(list[i]);
}
@@ -1452,7 +1452,7 @@ pub const Crypto = struct {
var all = std.EnumArray(Algorithm, ZigString).initUndefined();
var iter = all.iterator();
while (iter.next()) |entry| {
- entry.value.* = ZigString.init(std.mem.span(@tagName(entry.key)));
+ entry.value.* = ZigString.init(@tagName(entry.key));
}
break :brk all;
};
@@ -1612,7 +1612,7 @@ pub const Crypto = struct {
this: *CryptoHasher,
globalObject: *JSC.JSGlobalObject,
) callconv(.C) JSC.JSValue {
- return ZigString.fromUTF8(std.mem.span(@tagName(this.evp.algorithm))).toValueGC(globalObject);
+ return ZigString.fromUTF8(bun.asByteSlice(@tagName(this.evp.algorithm))).toValueGC(globalObject);
}
pub fn getAlgorithms(
@@ -3976,7 +3976,7 @@ pub const EnvironmentVariables = struct {
var vm = globalObject.bunVM();
const keys = vm.bundler.env.map.map.keys();
const max = @min(names.len, keys.len);
- for (keys[0..max]) |key, i| {
+ for (keys[0..max], 0..) |key, i| {
names[i] = ZigString.initUTF8(key);
}
return keys.len;
diff --git a/src/bun.js/api/bun/socket.zig b/src/bun.js/api/bun/socket.zig
index cf482e242..e18d7f9e5 100644
--- a/src/bun.js/api/bun/socket.zig
+++ b/src/bun.js/api/bun/socket.zig
@@ -578,7 +578,7 @@ pub const Listener = struct {
}
if (ssl) |ssl_config| {
- if (std.mem.span(ssl_config.server_name).len > 0)
+ if (bun.asByteSlice(ssl_config.server_name).len > 0)
uws.us_socket_context_add_server_name(1, socket.socket_context, ssl_config.server_name, ctx_opts, null);
}
diff --git a/src/bun.js/api/bun/spawn.zig b/src/bun.js/api/bun/spawn.zig
index b71e49dbc..8f52109f7 100644
--- a/src/bun.js/api/bun/spawn.zig
+++ b/src/bun.js/api/bun/spawn.zig
@@ -207,7 +207,9 @@ pub const PosixSpawn = struct {
);
if (comptime bun.Environment.allow_assert)
JSC.Node.Syscall.syslog("posix_spawn({s}) = {d} ({d})", .{
- path, rc, pid,
+ path,
+ rc,
+ pid,
});
if (comptime bun.Environment.isLinux) {
diff --git a/src/bun.js/api/bun/subprocess.zig b/src/bun.js/api/bun/subprocess.zig
index 614bff0ad..bb31f3dff 100644
--- a/src/bun.js/api/bun/subprocess.zig
+++ b/src/bun.js/api/bun/subprocess.zig
@@ -1119,8 +1119,9 @@ pub const Subprocess = struct {
};
if (key.eqlComptime("PATH")) {
- PATH = bun.span(line["PATH=".len..]);
+ PATH = bun.asByteSlice(line["PATH=".len..]);
}
+
env_array.append(allocator, line) catch {
globalThis.throw("out of memory", .{});
return .zero;
diff --git a/src/bun.js/api/ffi.zig b/src/bun.js/api/ffi.zig
index 2e493cebe..89192dc85 100644
--- a/src/bun.js/api/ffi.zig
+++ b/src/bun.js/api/ffi.zig
@@ -217,7 +217,7 @@ pub const FFI = struct {
}
JSC.markBinding(@src());
var zig_strings = allocator.alloc(ZigString, symbols.count()) catch unreachable;
- for (symbols.values()) |*function, i| {
+ for (symbols.values(), 0..) |*function, i| {
var arraylist = std.ArrayList(u8).init(allocator);
var writer = arraylist.writer();
function.printSourceCode(&writer) catch {
@@ -330,9 +330,9 @@ pub const FFI = struct {
// optional if the user passed "ptr"
if (function.symbol_from_dynamic_library == null) {
var resolved_symbol = dylib.lookup(*anyopaque, function_name) orelse {
- const ret = JSC.toInvalidArguments("Symbol \"{s}\" not found in \"{s}\"", .{ std.mem.span(function_name), name_slice.slice() }, global);
+ const ret = JSC.toInvalidArguments("Symbol \"{s}\" not found in \"{s}\"", .{ bun.asByteSlice(function_name), name_slice.slice() }, global);
for (symbols.values()) |*value| {
- allocator.free(bun.constStrToU8(std.mem.span(value.base_name.?)));
+ allocator.free(bun.constStrToU8(bun.asByteSlice(value.base_name.?)));
value.arg_types.clearAndFree(allocator);
}
symbols.clearAndFree(allocator);
@@ -345,12 +345,12 @@ pub const FFI = struct {
function.compile(allocator) catch |err| {
const ret = JSC.toInvalidArguments("{s} when compiling symbol \"{s}\" in \"{s}\"", .{
- std.mem.span(@errorName(err)),
- std.mem.span(function_name),
+ bun.asByteSlice(@errorName(err)),
+ bun.asByteSlice(function_name),
name_slice.slice(),
}, global);
for (symbols.values()) |*value| {
- allocator.free(bun.constStrToU8(std.mem.span(value.base_name.?)));
+ allocator.free(bun.constStrToU8(bun.asByteSlice(value.base_name.?)));
value.arg_types.clearAndFree(allocator);
}
symbols.clearAndFree(allocator);
@@ -360,7 +360,7 @@ pub const FFI = struct {
switch (function.step) {
.failed => |err| {
for (symbols.values()) |*value| {
- allocator.free(bun.constStrToU8(std.mem.span(value.base_name.?)));
+ allocator.free(bun.constStrToU8(bun.asByteSlice(value.base_name.?)));
value.arg_types.clearAndFree(allocator);
}
@@ -372,7 +372,7 @@ pub const FFI = struct {
},
.pending => {
for (symbols.values()) |*value| {
- allocator.free(bun.constStrToU8(std.mem.span(value.base_name.?)));
+ allocator.free(bun.constStrToU8(bun.asByteSlice(value.base_name.?)));
value.arg_types.clearAndFree(allocator);
}
symbols.clearAndFree(allocator);
@@ -380,7 +380,7 @@ pub const FFI = struct {
return ZigString.init("Failed to compile (nothing happend!)").toErrorInstance(global);
},
.compiled => |*compiled| {
- const str = ZigString.init(std.mem.span(function_name));
+ const str = ZigString.init(bun.asByteSlice(function_name));
const cb = JSC.NewRuntimeFunction(
global,
&str,
@@ -433,9 +433,9 @@ pub const FFI = struct {
const function_name = function.base_name.?;
if (function.symbol_from_dynamic_library == null) {
- const ret = JSC.toInvalidArguments("Symbol for \"{s}\" not found", .{std.mem.span(function_name)}, global);
+ const ret = JSC.toInvalidArguments("Symbol for \"{s}\" not found", .{bun.asByteSlice(function_name)}, global);
for (symbols.values()) |*value| {
- allocator.free(bun.constStrToU8(std.mem.span(value.base_name.?)));
+ allocator.free(bun.constStrToU8(bun.asByteSlice(value.base_name.?)));
value.arg_types.clearAndFree(allocator);
}
symbols.clearAndFree(allocator);
@@ -444,11 +444,11 @@ pub const FFI = struct {
function.compile(allocator) catch |err| {
const ret = JSC.toInvalidArguments("{s} when compiling symbol \"{s}\"", .{
- std.mem.span(@errorName(err)),
- std.mem.span(function_name),
+ bun.asByteSlice(@errorName(err)),
+ bun.asByteSlice(function_name),
}, global);
for (symbols.values()) |*value| {
- allocator.free(bun.constStrToU8(std.mem.span(value.base_name.?)));
+ allocator.free(bun.constStrToU8(bun.asByteSlice(value.base_name.?)));
value.arg_types.clearAndFree(allocator);
}
symbols.clearAndFree(allocator);
@@ -457,7 +457,7 @@ pub const FFI = struct {
switch (function.step) {
.failed => |err| {
for (symbols.values()) |*value| {
- allocator.free(bun.constStrToU8(std.mem.span(value.base_name.?)));
+ allocator.free(bun.constStrToU8(bun.asByteSlice(value.base_name.?)));
value.arg_types.clearAndFree(allocator);
}
@@ -468,14 +468,14 @@ pub const FFI = struct {
},
.pending => {
for (symbols.values()) |*value| {
- allocator.free(bun.constStrToU8(std.mem.span(value.base_name.?)));
+ allocator.free(bun.constStrToU8(bun.asByteSlice(value.base_name.?)));
value.arg_types.clearAndFree(allocator);
}
symbols.clearAndFree(allocator);
return ZigString.static("Failed to compile (nothing happend!)").toErrorInstance(global);
},
.compiled => |*compiled| {
- const name = &ZigString.init(std.mem.span(function_name));
+ const name = &ZigString.init(bun.asByteSlice(function_name));
const cb = JSC.NewRuntimeFunction(
global,
@@ -632,7 +632,7 @@ pub const FFI = struct {
}
function.base_name = try prop.toOwnedSliceZ(allocator);
- symbols.putAssumeCapacity(std.mem.span(function.base_name.?), function);
+ symbols.putAssumeCapacity(bun.asByteSlice(function.base_name.?), function);
}
return null;
@@ -656,8 +656,8 @@ pub const FFI = struct {
JSC.markBinding(@src());
if (val.base_name) |base_name| {
- if (std.mem.span(base_name).len > 0) {
- allocator.free(bun.constStrToU8(std.mem.span(base_name)));
+ if (bun.asByteSlice(base_name).len > 0) {
+ allocator.free(bun.constStrToU8(bun.asByteSlice(base_name)));
}
}
@@ -1058,7 +1058,7 @@ pub const FFI = struct {
}
if (comptime Environment.isRelease) {
- try writer.writeAll(std.mem.span(FFI_HEADER));
+ try writer.writeAll(bun.asByteSlice(FFI_HEADER));
} else {
try writer.writeAll(ffiHeader());
}
@@ -1067,10 +1067,10 @@ pub const FFI = struct {
try writer.writeAll("/* --- The Function To Call */\n");
try this.return_type.typename(writer);
try writer.writeAll(" ");
- try writer.writeAll(std.mem.span(this.base_name.?));
+ try writer.writeAll(bun.asByteSlice(this.base_name.?));
try writer.writeAll("(");
var first = true;
- for (this.arg_types.items) |arg, i| {
+ for (this.arg_types.items, 0..) |arg, i| {
if (!first) {
try writer.writeAll(", ");
}
@@ -1092,7 +1092,7 @@ pub const FFI = struct {
\\ LOAD_ARGUMENTS_FROM_CALL_FRAME;
\\
);
- for (this.arg_types.items) |arg, i| {
+ for (this.arg_types.items, 0..) |arg, i| {
if (arg.needsACastInC()) {
if (i < this.arg_types.items.len - 1) {
try writer.print(
@@ -1152,10 +1152,10 @@ pub const FFI = struct {
try this.return_type.typename(writer);
try writer.writeAll(" return_value = ");
}
- try writer.print("{s}(", .{std.mem.span(this.base_name.?)});
+ try writer.print("{s}(", .{bun.asByteSlice(this.base_name.?)});
first = true;
arg_buf[0..3].* = "arg".*;
- for (this.arg_types.items) |arg, i| {
+ for (this.arg_types.items, 0..) |arg, i| {
if (!first) {
try writer.writeAll(", ");
}
@@ -1229,7 +1229,7 @@ pub const FFI = struct {
}
if (comptime Environment.isRelease) {
- try writer.writeAll(std.mem.span(FFI_HEADER));
+ try writer.writeAll(bun.asByteSlice(FFI_HEADER));
} else {
try writer.writeAll(ffiHeader());
}
@@ -1241,7 +1241,7 @@ pub const FFI = struct {
try writer.writeAll(" my_callback_function");
try writer.writeAll("(");
var first = true;
- for (this.arg_types.items) |arg, i| {
+ for (this.arg_types.items, 0..) |arg, i| {
if (!first) {
try writer.writeAll(", ");
}
@@ -1256,7 +1256,7 @@ pub const FFI = struct {
try writer.writeAll(" my_callback_function");
try writer.writeAll("(");
- for (this.arg_types.items) |arg, i| {
+ for (this.arg_types.items, 0..) |arg, i| {
if (!first) {
try writer.writeAll(", ");
}
@@ -1279,7 +1279,7 @@ pub const FFI = struct {
try writer.print(" ZIG_REPR_TYPE arguments[{d}];\n", .{this.arg_types.items.len});
arg_buf[0.."arg".len].* = "arg".*;
- for (this.arg_types.items) |arg, i| {
+ for (this.arg_types.items, 0..) |arg, i| {
const printed = std.fmt.bufPrintIntToSlice(arg_buf["arg".len..], i, 10, .lower, .{});
const arg_name = arg_buf[0 .. "arg".len + printed.len];
try writer.print("arguments[{d}] = {any}.asZigRepr;\n", .{ i, arg.toJS(arg_name) });
@@ -1424,7 +1424,7 @@ pub const FFI = struct {
};
pub const map_to_js_object = brk: {
var count: usize = 2;
- for (map) |item, i| {
+ for (map, 0..) |item, i| {
var fmt = EnumMapFormatter{ .name = item.@"0", .entry = item.@"1" };
count += std.fmt.count("{}", .{fmt});
count += @boolToInt(i > 0);
@@ -1434,7 +1434,7 @@ pub const FFI = struct {
buf[0] = '{';
buf[buf.len - 1] = '}';
var end: usize = 1;
- for (map) |item, i| {
+ for (map, 0..) |item, i| {
var fmt = EnumMapFormatter{ .name = item.@"0", .entry = item.@"1" };
if (i > 0) {
buf[end] = ',';
@@ -1470,7 +1470,7 @@ pub const FFI = struct {
},
.char, .int8_t, .uint8_t, .int16_t, .uint16_t, .int32_t, .uint32_t => {
if (self.exact)
- try writer.print("({s})", .{std.mem.span(@tagName(self.tag))});
+ try writer.print("({s})", .{bun.asByteSlice(@tagName(self.tag))});
try writer.writeAll("JSVALUE_TO_INT32(");
},
diff --git a/src/bun.js/api/filesystem_router.zig b/src/bun.js/api/filesystem_router.zig
index 7141b5f5e..6e5465055 100644
--- a/src/bun.js/api/filesystem_router.zig
+++ b/src/bun.js/api/filesystem_router.zig
@@ -424,7 +424,7 @@ pub const FileSystemRouter = struct {
var name_strings = bun.default_allocator.alloc(ZigString, names.len * 2) catch unreachable;
defer bun.default_allocator.free(name_strings);
var paths_strings = name_strings[names.len..];
- for (names) |name, i| {
+ for (names, 0..) |name, i| {
name_strings[i] = ZigString.init(name).withEncoding();
paths_strings[i] = ZigString.init(paths[i]).withEncoding();
}
@@ -610,7 +610,7 @@ pub const MatchedRoute = struct {
std.debug.assert(entry.values.len > 0);
if (entry.values.len > 1) {
var values = query_string_value_refs_buf[0..entry.values.len];
- for (entry.values) |value, i| {
+ for (entry.values, 0..) |value, i| {
values[i] = ZigString.init(value).withEncoding();
}
obj.putRecord(global, &str, values.ptr, values.len);
diff --git a/src/bun.js/api/transpiler.zig b/src/bun.js/api/transpiler.zig
index eb070b6bc..8562a3204 100644
--- a/src/bun.js/api/transpiler.zig
+++ b/src/bun.js/api/transpiler.zig
@@ -203,7 +203,7 @@ pub const TransformTask = struct {
this.global,
bun.default_allocator,
logger.Msg{
- .data = logger.Data{ .text = std.mem.span(@errorName(err)) },
+ .data = logger.Data{ .text = bun.asByteSlice(@errorName(err)) },
},
));
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-30 01:59:47 +0000