mirror of
https://github.com/oven-sh/bun
synced 2026-02-14 21:01:52 +00:00
Update to zig 0.15.2 (#24204)
Fixes ENG-21287
Build times, from `bun run build && echo '//' >> src/main.zig && time
bun run build`
|Platform|0.14.1|0.15.2|Speedup|
|-|-|-|-|
|macos debug asan|126.90s|106.27s|1.19x|
|macos debug noasan|60.62s|50.85s|1.19x|
|linux debug asan|292.77s|241.45s|1.21x|
|linux debug noasan|146.58s|130.94s|1.12x|
|linux debug use_llvm=false|n/a|78.27s|1.87x|
|windows debug asan|177.13s|142.55s|1.24x|
Runtime performance:
- next build memory usage may have gone up by 5%. Otherwise seems the
same. Some code with writers may have gotten slower, especially one
instance of a counting writer and a few instances of unbuffered writers
that now have vtable overhead.
- File size reduced by 800kb (from 100.2mb to 99.4mb)
Improvements:
- `@export` hack is no longer needed for watch
- native x86_64 backend for linux builds faster. to use it, set use_llvm
false and no_link_obj false. also set `ASAN_OPTIONS=detect_leaks=0`
otherwise it will spam the output with tens of thousands of lines of
debug info errors. may need to use the zig lldb fork for debugging.
- zig test-obj, which we will be able to use for zig unit tests
Still an issue:
- false 'dependency loop' errors remain in watch mode
- watch mode crashes observed
Follow-up:
- [ ] search `comptime Writer: type` and `comptime W: type` and remove
- [ ] remove format_mode in our zig fork
- [ ] remove deprecated.zig autoFormatLabelFallback
- [ ] remove deprecated.zig autoFormatLabel
- [ ] remove deprecated.BufferedWriter and BufferedReader
- [ ] remove override_no_export_cpp_apis as it is no longer needed
- [ ] css Parser(W) -> Parser, and remove all the comptime writer: type
params
- [ ] remove deprecated writer fully
Files that add lines:
```
649 src/deprecated.zig
167 scripts/pack-codegen-for-zig-team.ts
54 scripts/cleartrace-impl.js
46 scripts/cleartrace.ts
43 src/windows.zig
18 src/fs.zig
17 src/bun.js/ConsoleObject.zig
16 src/output.zig
12 src/bun.js/test/debug.zig
12 src/bun.js/node/node_fs.zig
8 src/env_loader.zig
7 src/css/printer.zig
7 src/cli/init_command.zig
7 src/bun.js/node.zig
6 src/string/escapeRegExp.zig
6 src/install/PnpmMatcher.zig
5 src/bun.js/webcore/Blob.zig
4 src/crash_handler.zig
4 src/bun.zig
3 src/install/lockfile/bun.lock.zig
3 src/cli/update_interactive_command.zig
3 src/cli/pack_command.zig
3 build.zig
2 src/Progress.zig
2 src/install/lockfile/lockfile_json_stringify_for_debugging.zig
2 src/css/small_list.zig
2 src/bun.js/webcore/prompt.zig
1 test/internal/ban-words.test.ts
1 test/internal/ban-limits.json
1 src/watcher/WatcherTrace.zig
1 src/transpiler.zig
1 src/shell/builtin/cp.zig
1 src/js_printer.zig
1 src/io/PipeReader.zig
1 src/install/bin.zig
1 src/css/selectors/selector.zig
1 src/cli/run_command.zig
1 src/bun.js/RuntimeTranspilerStore.zig
1 src/bun.js/bindings/JSRef.zig
1 src/bake/DevServer.zig
```
Files that remove lines:
```
-1 src/test/recover.zig
-1 src/sql/postgres/SocketMonitor.zig
-1 src/sql/mysql/MySQLRequestQueue.zig
-1 src/sourcemap/CodeCoverage.zig
-1 src/css/values/color_js.zig
-1 src/compile_target.zig
-1 src/bundler/linker_context/convertStmtsForChunk.zig
-1 src/bundler/bundle_v2.zig
-1 src/bun.js/webcore/blob/read_file.zig
-1 src/ast/base.zig
-2 src/sql/postgres/protocol/ArrayList.zig
-2 src/shell/builtin/mkdir.zig
-2 src/install/PackageManager/patchPackage.zig
-2 src/install/PackageManager/PackageManagerDirectories.zig
-2 src/fmt.zig
-2 src/css/declaration.zig
-2 src/css/css_parser.zig
-2 src/collections/baby_list.zig
-2 src/bun.js/bindings/ZigStackFrame.zig
-2 src/ast/E.zig
-3 src/StandaloneModuleGraph.zig
-3 src/deps/picohttp.zig
-3 src/deps/libuv.zig
-3 src/btjs.zig
-4 src/threading/Futex.zig
-4 src/shell/builtin/touch.zig
-4 src/meta.zig
-4 src/install/lockfile.zig
-4 src/css/selectors/parser.zig
-5 src/shell/interpreter.zig
-5 src/css/error.zig
-5 src/bun.js/web_worker.zig
-5 src/bun.js.zig
-6 src/cli/test_command.zig
-6 src/bun.js/VirtualMachine.zig
-6 src/bun.js/uuid.zig
-6 src/bun.js/bindings/JSValue.zig
-9 src/bun.js/test/pretty_format.zig
-9 src/bun.js/api/BunObject.zig
-14 src/install/install_binding.zig
-14 src/fd.zig
-14 src/bun.js/node/path.zig
-14 scripts/pack-codegen-for-zig-team.sh
-17 src/bun.js/test/diff_format.zig
```
`git diff --numstat origin/main...HEAD | awk '{ print ($1-$2)"\t"$3 }' |
sort -rn`
---------
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Dylan Conway <dylan.conway567@gmail.com>
Co-authored-by: Meghan Denny <meghan@bun.com>
Co-authored-by: tayor.fish <contact@taylor.fish>
This commit is contained in:
@@ -11,7 +11,7 @@ pub const TerminalHyperlink = struct {
|
||||
};
|
||||
}
|
||||
|
||||
pub fn format(this: @This(), comptime _: []const u8, _: std.fmt.FormatOptions, writer: anytype) !void {
|
||||
pub fn format(this: @This(), writer: *std.Io.Writer) !void {
|
||||
if (this.enabled) {
|
||||
const ESC = "\x1b";
|
||||
const OSC8 = ESC ++ "]8;;";
|
||||
@@ -151,7 +151,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
updates: []const PackageUpdate,
|
||||
) !void {
|
||||
// Group updates by workspace
|
||||
var workspace_groups = bun.StringHashMap(std.ArrayList(PackageUpdate)).init(bun.default_allocator);
|
||||
var workspace_groups = bun.StringHashMap(std.array_list.Managed(PackageUpdate)).init(bun.default_allocator);
|
||||
defer {
|
||||
var it = workspace_groups.iterator();
|
||||
while (it.next()) |entry| {
|
||||
@@ -164,7 +164,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
for (updates) |update| {
|
||||
const result = try workspace_groups.getOrPut(update.workspace_path);
|
||||
if (!result.found_existing) {
|
||||
result.value_ptr.* = std.ArrayList(PackageUpdate).init(bun.default_allocator);
|
||||
result.value_ptr.* = std.array_list.Managed(PackageUpdate).init(bun.default_allocator);
|
||||
}
|
||||
try result.value_ptr.append(update);
|
||||
}
|
||||
@@ -243,7 +243,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
) !void {
|
||||
|
||||
// Group catalog updates by workspace path
|
||||
var workspace_catalog_updates = bun.StringHashMap(std.ArrayList(CatalogUpdateRequest)).init(bun.default_allocator);
|
||||
var workspace_catalog_updates = bun.StringHashMap(std.array_list.Managed(CatalogUpdateRequest)).init(bun.default_allocator);
|
||||
defer {
|
||||
var it = workspace_catalog_updates.iterator();
|
||||
while (it.next()) |entry| {
|
||||
@@ -260,7 +260,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
|
||||
const result = try workspace_catalog_updates.getOrPut(update.workspace_path);
|
||||
if (!result.found_existing) {
|
||||
result.value_ptr.* = std.ArrayList(CatalogUpdateRequest).init(bun.default_allocator);
|
||||
result.value_ptr.* = std.array_list.Managed(CatalogUpdateRequest).init(bun.default_allocator);
|
||||
}
|
||||
|
||||
// Parse catalog_key (format: "package_name" or "package_name:catalog_name")
|
||||
@@ -404,7 +404,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
|
||||
// Create package specifier array from selected packages
|
||||
// Group selected packages by workspace
|
||||
var workspace_updates = bun.StringHashMap(std.ArrayList([]const u8)).init(bun.default_allocator);
|
||||
var workspace_updates = bun.StringHashMap(std.array_list.Managed([]const u8)).init(bun.default_allocator);
|
||||
defer {
|
||||
var it = workspace_updates.iterator();
|
||||
while (it.next()) |entry| {
|
||||
@@ -426,7 +426,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
}
|
||||
|
||||
// Collect all package updates with full information
|
||||
var package_updates = std.ArrayList(PackageUpdate).init(bun.default_allocator);
|
||||
var package_updates = std.array_list.Managed(PackageUpdate).init(bun.default_allocator);
|
||||
defer package_updates.deinit();
|
||||
|
||||
// Process selected packages
|
||||
@@ -640,7 +640,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
packages: []OutdatedPackage,
|
||||
) ![]OutdatedPackage {
|
||||
// Create a map to track catalog dependencies by name
|
||||
var catalog_map = bun.StringHashMap(std.ArrayList(OutdatedPackage)).init(allocator);
|
||||
var catalog_map = bun.StringHashMap(std.array_list.Managed(OutdatedPackage)).init(allocator);
|
||||
defer catalog_map.deinit();
|
||||
defer {
|
||||
var iter = catalog_map.iterator();
|
||||
@@ -649,7 +649,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
}
|
||||
}
|
||||
|
||||
var result = std.ArrayList(OutdatedPackage).init(allocator);
|
||||
var result = std.array_list.Managed(OutdatedPackage).init(allocator);
|
||||
defer result.deinit();
|
||||
|
||||
// Group catalog dependencies
|
||||
@@ -657,7 +657,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
if (pkg.is_catalog) {
|
||||
const entry = try catalog_map.getOrPut(pkg.name);
|
||||
if (!entry.found_existing) {
|
||||
entry.value_ptr.* = std.ArrayList(OutdatedPackage).init(allocator);
|
||||
entry.value_ptr.* = std.array_list.Managed(OutdatedPackage).init(allocator);
|
||||
}
|
||||
try entry.value_ptr.append(pkg);
|
||||
} else {
|
||||
@@ -674,7 +674,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
var first = catalog_packages[0];
|
||||
|
||||
// Build combined workspace name
|
||||
var workspace_names = std.ArrayList(u8).init(allocator);
|
||||
var workspace_names = std.array_list.Managed(u8).init(allocator);
|
||||
defer workspace_names.deinit();
|
||||
|
||||
if (catalog_packages.len > 0) {
|
||||
@@ -726,10 +726,10 @@ pub const UpdateInteractiveCommand = struct {
|
||||
const pkg_resolutions = packages.items(.resolution);
|
||||
const pkg_dependencies = packages.items(.dependencies);
|
||||
|
||||
var outdated_packages = std.ArrayList(OutdatedPackage).init(allocator);
|
||||
var outdated_packages = std.array_list.Managed(OutdatedPackage).init(allocator);
|
||||
defer outdated_packages.deinit();
|
||||
|
||||
var version_buf = std.ArrayList(u8).init(allocator);
|
||||
var version_buf = std.array_list.Managed(u8).init(allocator);
|
||||
defer version_buf.deinit();
|
||||
const version_writer = version_buf.writer();
|
||||
|
||||
@@ -787,15 +787,15 @@ pub const UpdateInteractiveCommand = struct {
|
||||
}
|
||||
|
||||
version_buf.clearRetainingCapacity();
|
||||
try version_writer.print("{}", .{resolution.value.npm.version.fmt(string_buf)});
|
||||
try version_writer.print("{f}", .{resolution.value.npm.version.fmt(string_buf)});
|
||||
const current_version_buf = try allocator.dupe(u8, version_buf.items);
|
||||
|
||||
version_buf.clearRetainingCapacity();
|
||||
try version_writer.print("{}", .{update_version.version.fmt(manifest.string_buf)});
|
||||
try version_writer.print("{f}", .{update_version.version.fmt(manifest.string_buf)});
|
||||
const update_version_buf = try allocator.dupe(u8, version_buf.items);
|
||||
|
||||
version_buf.clearRetainingCapacity();
|
||||
try version_writer.print("{}", .{latest.version.fmt(manifest.string_buf)});
|
||||
try version_writer.print("{f}", .{latest.version.fmt(manifest.string_buf)});
|
||||
const latest_version_buf = try allocator.dupe(u8, version_buf.items);
|
||||
|
||||
// Already filtered by version.order check above
|
||||
@@ -1452,14 +1452,14 @@ pub const UpdateInteractiveCommand = struct {
|
||||
|
||||
if (selected) {
|
||||
if (strings.eqlComptime(checkbox_color, "red")) {
|
||||
Output.pretty("<r><red>{}<r>", .{hyperlink});
|
||||
Output.pretty("<r><red>{f}<r>", .{hyperlink});
|
||||
} else if (strings.eqlComptime(checkbox_color, "yellow")) {
|
||||
Output.pretty("<r><yellow>{}<r>", .{hyperlink});
|
||||
Output.pretty("<r><yellow>{f}<r>", .{hyperlink});
|
||||
} else {
|
||||
Output.pretty("<r><green>{}<r>", .{hyperlink});
|
||||
Output.pretty("<r><green>{f}<r>", .{hyperlink});
|
||||
}
|
||||
} else {
|
||||
Output.pretty("<r>{}<r>", .{hyperlink});
|
||||
Output.pretty("<r>{f}<r>", .{hyperlink});
|
||||
}
|
||||
|
||||
// Print dev/peer/optional tag if applicable
|
||||
@@ -1522,7 +1522,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
Output.pretty("<r>{s}<r>", .{truncated_target});
|
||||
} else {
|
||||
// Use diffFmt for full versions
|
||||
Output.pretty("{}", .{target_full.diffFmt(
|
||||
Output.pretty("{f}", .{target_full.diffFmt(
|
||||
current_full,
|
||||
pkg.update_version,
|
||||
pkg.current_version,
|
||||
@@ -1582,7 +1582,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
Output.pretty("<r>{s}<r>", .{truncated_latest});
|
||||
} else {
|
||||
// Use diffFmt for full versions
|
||||
Output.pretty("{}", .{latest_full.diffFmt(
|
||||
Output.pretty("{f}", .{latest_full.diffFmt(
|
||||
current_full,
|
||||
pkg.latest_version,
|
||||
pkg.current_version,
|
||||
@@ -1643,7 +1643,10 @@ pub const UpdateInteractiveCommand = struct {
|
||||
Output.flush();
|
||||
|
||||
// Read input
|
||||
const byte = std.io.getStdIn().reader().readByte() catch return state.selected;
|
||||
var reader_buffer: [1]u8 = undefined;
|
||||
var reader_file = std.fs.File.stdin().readerStreaming(&reader_buffer);
|
||||
const reader = &reader_file.interface;
|
||||
const byte = reader.takeByte() catch return state.selected;
|
||||
|
||||
switch (byte) {
|
||||
'\n', '\r' => return state.selected,
|
||||
@@ -1707,9 +1710,9 @@ pub const UpdateInteractiveCommand = struct {
|
||||
state.toggle_all = false;
|
||||
},
|
||||
27 => { // escape sequence
|
||||
const seq = std.io.getStdIn().reader().readByte() catch continue;
|
||||
const seq = reader.takeByte() catch continue;
|
||||
if (seq == '[') {
|
||||
const arrow = std.io.getStdIn().reader().readByte() catch continue;
|
||||
const arrow = reader.takeByte() catch continue;
|
||||
switch (arrow) {
|
||||
'A' => { // up arrow
|
||||
if (state.cursor > 0) {
|
||||
@@ -1736,7 +1739,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
state.selected[state.cursor] = true;
|
||||
},
|
||||
'5' => { // Page Up
|
||||
const tilde = std.io.getStdIn().reader().readByte() catch continue;
|
||||
const tilde = reader.takeByte() catch continue;
|
||||
if (tilde == '~') {
|
||||
// Move up by viewport height
|
||||
if (state.cursor >= state.viewport_height) {
|
||||
@@ -1748,7 +1751,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
}
|
||||
},
|
||||
'6' => { // Page Down
|
||||
const tilde = std.io.getStdIn().reader().readByte() catch continue;
|
||||
const tilde = reader.takeByte() catch continue;
|
||||
if (tilde == '~') {
|
||||
// Move down by viewport height
|
||||
if (state.cursor + state.viewport_height < state.packages.len) {
|
||||
@@ -1764,7 +1767,7 @@ pub const UpdateInteractiveCommand = struct {
|
||||
var buffer: [32]u8 = undefined;
|
||||
var buf_idx: usize = 0;
|
||||
while (buf_idx < buffer.len) : (buf_idx += 1) {
|
||||
const c = std.io.getStdIn().reader().readByte() catch break;
|
||||
const c = reader.takeByte() catch break;
|
||||
if (c == 'M' or c == 'm') {
|
||||
// Parse SGR mouse event: ESC[<button;col;row(M or m)
|
||||
// button: 64 = scroll up, 65 = scroll down
|
||||
|
||||
Reference in New Issue
Block a user