aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bun.js/bindings/headers-cpp.h2
-rw-r--r--src/bun.js/bindings/headers.h2
-rw-r--r--src/cli/create_command.zig13
-rw-r--r--src/cli/run_command.zig8
-rw-r--r--src/cli/upgrade_command.zig5
-rw-r--r--src/env_loader.zig12
-rw-r--r--src/exact_size_matcher.zig2
-rw-r--r--src/futex.zig2
-rw-r--r--src/hash_map.zig6
-rw-r--r--src/install/install.zig2
-rw-r--r--src/install/lockfile.zig2
-rw-r--r--src/main.zig2
-rw-r--r--src/open.zig6
-rw-r--r--src/sha.zig17
-rw-r--r--src/string_immutable.zig20
-rw-r--r--src/zlib.zig2
16 files changed, 54 insertions, 49 deletions
diff --git a/src/bun.js/bindings/headers-cpp.h b/src/bun.js/bindings/headers-cpp.h
index a299530c3..627b234cd 100644
--- a/src/bun.js/bindings/headers-cpp.h
+++ b/src/bun.js/bindings/headers-cpp.h
@@ -1,4 +1,4 @@
-//-- AUTOGENERATED FILE -- 1657353886
+//-- AUTOGENERATED FILE -- 1657408675
// clang-format off
#pragma once
diff --git a/src/bun.js/bindings/headers.h b/src/bun.js/bindings/headers.h
index 091a75896..c1e70807f 100644
--- a/src/bun.js/bindings/headers.h
+++ b/src/bun.js/bindings/headers.h
@@ -1,5 +1,5 @@
// clang-format off
-//-- AUTOGENERATED FILE -- 1657353886
+//-- AUTOGENERATED FILE -- 1657408675
#pragma once
#include <stddef.h>
diff --git a/src/cli/create_command.zig b/src/cli/create_command.zig
index 5b4c214c3..fb65152cf 100644
--- a/src/cli/create_command.zig
+++ b/src/cli/create_command.zig
@@ -107,8 +107,7 @@ fn execTask(allocator: std.mem.Allocator, task_: string, cwd: string, _: string,
const npm_args = 2 * @intCast(usize, @boolToInt(npm_client != null));
const total = count + npm_args;
var argv = allocator.alloc(string, total) catch return;
- var proc: *std.ChildProcess = undefined;
- defer proc.deinit();
+ var proc: std.ChildProcess = undefined;
defer if (argv.len > 32) allocator.free(argv);
if (npm_client) |client| {
@@ -145,7 +144,7 @@ fn execTask(allocator: std.mem.Allocator, task_: string, cwd: string, _: string,
Output.disableBuffering();
defer Output.enableBuffering();
- proc = std.ChildProcess.init(argv, allocator) catch return;
+ proc = std.ChildProcess.init(argv, allocator) ;
proc.stdin_behavior = .Inherit;
proc.stdout_behavior = .Inherit;
proc.stderr_behavior = .Inherit;
@@ -1514,7 +1513,7 @@ pub const CreateCommand = struct {
Output.pretty("<r>\n", .{});
Output.flush();
- var process = try std.ChildProcess.init(install_args, ctx.allocator);
+ var process = std.ChildProcess.init(install_args, ctx.allocator);
process.cwd = destination;
defer {
@@ -1526,7 +1525,6 @@ pub const CreateCommand = struct {
Output.print("\n", .{});
Output.flush();
}
- defer process.deinit();
_ = try process.spawnAndWait();
@@ -1648,7 +1646,7 @@ pub const CreateCommand = struct {
if (create_options.open) {
if (which(&bun_path_buf, PATH, destination, "bun")) |bin| {
var argv = [_]string{std.mem.span(bin)};
- var child = try std.ChildProcess.init(&argv, ctx.allocator);
+ var child = std.ChildProcess.init(&argv, ctx.allocator);
child.cwd = destination;
child.stdin_behavior = .Inherit;
child.stdout_behavior = .Inherit;
@@ -2221,12 +2219,11 @@ const GitHandler = struct {
inline for (comptime std.meta.fieldNames(@TypeOf(Commands))) |command_field| {
const command: []const string = @field(git_commands, command_field);
- var process = try std.ChildProcess.init(command, default_allocator);
+ var process = std.ChildProcess.init(command, default_allocator);
process.cwd = destination;
process.stdin_behavior = .Inherit;
process.stdout_behavior = .Inherit;
process.stderr_behavior = .Inherit;
- defer process.deinit();
_ = try process.spawnAndWait();
_ = process.kill() catch undefined;
diff --git a/src/cli/run_command.zig b/src/cli/run_command.zig
index 6f9932970..89a8b6787 100644
--- a/src/cli/run_command.zig
+++ b/src/cli/run_command.zig
@@ -240,14 +240,14 @@ pub const RunCommand = struct {
}
var argv = [_]string{ shell_bin, "-c", combined_script };
- var child_process = try std.ChildProcess.init(&argv, ctx.allocator);
+ var child_process = std.ChildProcess.init(&argv, ctx.allocator);
if (!silent) {
Output.prettyErrorln("<r><d><magenta>$<r> <d><b>{s}<r>", .{combined_script});
Output.flush();
}
- var buf_map = try env.map.cloneToBufMap(ctx.allocator);
+ var buf_map = try env.map.cloneToEnvMap(ctx.allocator);
child_process.env_map = &buf_map;
child_process.cwd = cwd;
@@ -287,9 +287,9 @@ pub const RunCommand = struct {
argv = array_list.toOwnedSlice();
}
- var child_process = try std.ChildProcess.init(argv, ctx.allocator);
+ var child_process = std.ChildProcess.init(argv, ctx.allocator);
- var buf_map = try env.map.cloneToBufMap(ctx.allocator);
+ var buf_map = try env.map.cloneToEnvMap(ctx.allocator);
child_process.cwd = cwd;
child_process.env_map = &buf_map;
child_process.stderr_behavior = .Inherit;
diff --git a/src/cli/upgrade_command.zig b/src/cli/upgrade_command.zig
index 8f94b54c4..699663f8d 100644
--- a/src/cli/upgrade_command.zig
+++ b/src/cli/upgrade_command.zig
@@ -499,8 +499,7 @@ pub const UpgradeCommand = struct {
std.mem.span(tmpname),
};
- var unzip_process = try std.ChildProcess.init(&unzip_argv, ctx.allocator);
- defer unzip_process.deinit();
+ var unzip_process = std.ChildProcess.init(&unzip_argv, ctx.allocator);
unzip_process.cwd = tmpdir_path;
unzip_process.stdin_behavior = .Inherit;
unzip_process.stdout_behavior = .Inherit;
@@ -594,7 +593,7 @@ pub const UpgradeCommand = struct {
};
env_loader.map.put("IS_BUN_AUTO_UPDATE", "true") catch unreachable;
- var buf_map = try env_loader.map.cloneToBufMap(ctx.allocator);
+ var buf_map = try env_loader.map.cloneToEnvMap(ctx.allocator);
_ = std.ChildProcess.exec(.{
.allocator = ctx.allocator,
.argv = &completions_argv,
diff --git a/src/env_loader.zig b/src/env_loader.zig
index 55e1d74f0..41bb7e804 100644
--- a/src/env_loader.zig
+++ b/src/env_loader.zig
@@ -435,8 +435,8 @@ pub const Loader = struct {
return this.get(key) orelse key;
}
- /// Load values from the environment into Define.
- ///
+ /// Load values from the environment into Define.
+ ///
/// If there is a framework, values from the framework are inserted with a
/// **lower priority** so that users may override defaults. Unlike regular
/// defines, environment variables are loaded as JavaScript string literals.
@@ -959,8 +959,8 @@ pub const Map = struct {
map: HashTable,
- pub fn cloneToBufMap(this: *Map, allocator: std.mem.Allocator) !std.BufMap {
- var buf_map = std.BufMap.init(allocator);
+ pub fn cloneToEnvMap(this: *Map, allocator: std.mem.Allocator) !std.process.EnvMap {
+ var env_map = std.process.EnvMap.init(allocator);
const Convert = struct {
pub fn constStrToU8(s: string) []u8 {
@@ -970,10 +970,10 @@ pub const Map = struct {
var iter_ = this.map.iterator();
while (iter_.next()) |entry| {
- try buf_map.putMove(Convert.constStrToU8(entry.key_ptr.*), Convert.constStrToU8(entry.value_ptr.*));
+ try env_map.putMove(Convert.constStrToU8(entry.key_ptr.*), Convert.constStrToU8(entry.value_ptr.*));
}
- return buf_map;
+ return env_map;
}
pub inline fn init(allocator: std.mem.Allocator) Map {
diff --git a/src/exact_size_matcher.zig b/src/exact_size_matcher.zig
index 011adb7f8..961737a9d 100644
--- a/src/exact_size_matcher.zig
+++ b/src/exact_size_matcher.zig
@@ -29,7 +29,7 @@ pub fn ExactSizeMatcher(comptime max_bytes: usize) type {
return std.mem.readIntNative(T, &tmp);
},
max_bytes => {
- return std.mem.readIntSliceNative(T, str);
+ return std.mem.readIntSliceNative(T, str[0..]);
},
0 => {
return 0;
diff --git a/src/futex.zig b/src/futex.zig
index 6fad775c9..ad8ff84b9 100644
--- a/src/futex.zig
+++ b/src/futex.zig
@@ -163,7 +163,7 @@ const LinuxFutex = struct {
switch (linux.getErrno(linux.futex_wake(
@ptrCast(*const i32, ptr),
linux.FUTEX.PRIVATE_FLAG | linux.FUTEX.WAKE,
- std.math.cast(i32, num_waiters) catch std.math.maxInt(i32),
+ std.math.cast(i32, num_waiters) orelse std.math.maxInt(i32),
))) {
.SUCCESS => {}, // successful wake up
.INVAL => {}, // invalid futex_wait() on ptr done elsewhere
diff --git a/src/hash_map.zig b/src/hash_map.zig
index 4f5c72e2f..58171eae0 100644
--- a/src/hash_map.zig
+++ b/src/hash_map.zig
@@ -1180,7 +1180,7 @@ test "std.hash_map put and remove loop in random order" {
var rng = std.rand.DefaultPrng.init(0);
while (i < iterations) : (i += 1) {
- std.rand.Random.shuffle(&rng.random, u32, keys.items);
+ std.rand.Random.shuffle(rng.random(), u32, keys.items);
for (keys.items) |key| {
try map.put(key, key);
@@ -1209,13 +1209,13 @@ test "std.hash_map remove one million elements in random order" {
}
var rng = std.rand.DefaultPrng.init(0);
- std.rand.Random.shuffle(&rng.random, u32, keys.items);
+ std.rand.Random.shuffle(rng.random(), u32, keys.items);
for (keys.items) |key| {
map.put(key, key) catch unreachable;
}
- std.rand.Random.shuffle(&rng.random, u32, keys.items);
+ std.rand.Random.shuffle(rng.random(), u32, keys.items);
i = 0;
while (i < n) : (i += 1) {
const key = keys.items[i];
diff --git a/src/install/install.zig b/src/install/install.zig
index ff952af8d..ef737623b 100644
--- a/src/install/install.zig
+++ b/src/install/install.zig
@@ -1788,7 +1788,7 @@ pub const PackageManager = struct {
var tmpfile = FileSystem.RealFS.Tmpfile{};
var secret: [32]u8 = undefined;
std.mem.writeIntNative(u64, secret[0..8], @intCast(u64, std.time.milliTimestamp()));
- var rng = std.rand.Gimli.init(secret).random();
+ var rng = std.rand.Xoodoo.init(secret).random();
var base64_bytes: [64]u8 = undefined;
rng.bytes(&base64_bytes);
diff --git a/src/install/lockfile.zig b/src/install/lockfile.zig
index 21ee9f314..bbddf8f70 100644
--- a/src/install/lockfile.zig
+++ b/src/install/lockfile.zig
@@ -1388,7 +1388,7 @@ pub fn saveToDisk(this: *Lockfile, filename: stringZ) void {
var tmpfile = FileSystem.RealFS.Tmpfile{};
var secret: [32]u8 = undefined;
std.mem.writeIntNative(u64, secret[0..8], @intCast(u64, std.time.milliTimestamp()));
- var rng = std.rand.Gimli.init(secret);
+ var rng = std.rand.Xoodoo.init(secret);
var base64_bytes: [64]u8 = undefined;
rng.random().bytes(&base64_bytes);
diff --git a/src/main.zig b/src/main.zig
index c40d9f71a..9d92942be 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -24,7 +24,7 @@ pub const MainPanicHandler = panicky.NewPanicHandler(std.builtin.default_panic);
const js = @import("bun.js/bindings/bindings.zig");
const JavaScript = @import("bun.js/javascript.zig");
pub const io_mode = .blocking;
-pub const bindgen = @import("build_options").bindgen;
+pub const bindgen = if (@import("builtin").is_test) undefined else @import("build_options").bindgen;
const Report = @import("./report.zig");
pub fn panic(msg: []const u8, error_return_trace: ?*std.builtin.StackTrace) noreturn {
MainPanicHandler.handle_panic(msg, error_return_trace);
diff --git a/src/open.zig b/src/open.zig
index 26b980a66..36c4a9a35 100644
--- a/src/open.zig
+++ b/src/open.zig
@@ -25,7 +25,7 @@ pub fn openURL(url: string) !void {
}
var args_buf = [_]string{ opener, url };
- var child_process = try std.ChildProcess.init(&args_buf, default_allocator);
+ var child_process = std.ChildProcess.init(&args_buf, default_allocator);
child_process.stderr_behavior = .Pipe;
child_process.stdin_behavior = .Ignore;
child_process.stdout_behavior = .Pipe;
@@ -311,14 +311,14 @@ pub const Editor = enum(u8) {
},
}
- spawned.child_process = try std.ChildProcess.init(args_buf[0..i], default_allocator);
+ spawned.child_process = std.ChildProcess.init(args_buf[0..i], default_allocator);
var thread = try std.Thread.spawn(.{}, autoClose, .{spawned});
thread.detach();
}
const SpawnedEditorContext = struct {
file_path_buf: [1024 + bun.MAX_PATH_BYTES]u8 = undefined,
buf: [10]string = undefined,
- child_process: *std.ChildProcess = undefined,
+ child_process: std.ChildProcess = undefined,
};
fn autoClose(spawned: *SpawnedEditorContext) void {
diff --git a/src/sha.zig b/src/sha.zig
index 415941fb4..354c1583b 100644
--- a/src/sha.zig
+++ b/src/sha.zig
@@ -228,11 +228,12 @@ pub fn main() anyerror!void {
}
}
-test "sha256" {
- const value: []const u8 = "hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world!";
- var hash: SHA256.Digest = undefined;
- var hash2: SHA256.Digest = undefined;
- SHA256.hash(value, &hash);
- std.crypto.hash.sha2.Sha256.hash(value, &hash2, .{});
- try std.testing.expectEqual(hash, hash2);
-}
+// TODO(sno2): update SHA256 test to include BoringSSL engine
+// test "sha256" {
+// const value: []const u8 = "hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world! hello, world!";
+// var hash: SHA256.Digest = undefined;
+// var hash2: SHA256.Digest = undefined;
+// SHA256.hash(value, &hash);
+// std.crypto.hash.sha2.Sha256.hash(value, &hash2, .{});
+// try std.testing.expectEqual(hash, hash2);
+// }
diff --git a/src/string_immutable.zig b/src/string_immutable.zig
index 8f347b047..479342025 100644
--- a/src/string_immutable.zig
+++ b/src/string_immutable.zig
@@ -16,11 +16,19 @@ pub inline fn contains(self: string, str: string) bool {
}
pub fn toUTF16Literal(comptime str: []const u8) []const u16 {
- const Static = struct {
- pub const literal = std.unicode.utf8ToUtf16LeStringLiteral(str);
- };
+ comptime {
+ comptime var output: [str.len]u16 = undefined;
+
+ for (str) |c, i| {
+ output[i] = c;
+ }
- return Static.literal;
+ const Static = struct {
+ pub const literal: []const u16 = output[0..];
+ };
+
+ return Static.literal;
+ }
}
const OptionalUsize = std.meta.Int(.unsigned, @bitSizeOf(usize) - 1);
@@ -2863,7 +2871,7 @@ test "decodeHexToBytes" {
var good: [4096]u8 = undefined;
var ours_buf: [4096]u8 = undefined;
var match = try std.fmt.hexToBytes(good[0..1024], hex);
- var ours = decodeHexToBytes(&ours_buf, hex);
+ var ours = decodeHexToBytes(&ours_buf, u8, hex);
try std.testing.expectEqualSlices(u8, match, ours_buf[0..ours]);
try std.testing.expectEqualSlices(u8, &buffer, ours_buf[0..ours]);
}
@@ -3016,7 +3024,7 @@ pub fn firstNonASCII16CheckMin(comptime Slice: type, slice: Slice, comptime chec
return null;
}
-/// Fast path for printing template literal strings
+/// Fast path for printing template literal strings
pub fn @"nextUTF16NonASCIIOr$`\\"(
comptime Slice: type,
slice: Slice,
diff --git a/src/zlib.zig b/src/zlib.zig
index 7603c9654..958454b6c 100644
--- a/src/zlib.zig
+++ b/src/zlib.zig
@@ -242,7 +242,7 @@ pub fn NewZlibReader(comptime Writer: type, comptime buffer_size: usize) type {
pub fn alloc(ctx: *anyopaque, items: uInt, len: uInt) callconv(.C) *anyopaque {
var this = @ptrCast(*ZlibReader, @alignCast(@alignOf(*ZlibReader), ctx));
- const buf = this.arena.allocator.alloc(u8, items * len) catch unreachable;
+ const buf = this.arena.allocator().alloc(u8, items * len) catch unreachable;
return buf.ptr;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-09 00:22:15 +0000