authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-27 20:53:25-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-05-27 20:56:49-07:00
log5bdfe22092716d0e590979a678a3f5bf715439e9
tree770048e8a4d237e384e3e9b4209ebb3f9d32c9c7
parent947a3a1be92e0d5ddc5ad263d9434b31e8c170db

CLI: actually fix translate-c creating root progress node twice

7281cc1d839da6e84bb76fadb2c1eafc22a82df7 did not solve the problem because even when Node.index is none, it still counts as initializing the global Progress object. Just use a normal zig optional, and all is good.

1 files changed, 4 insertions(+), 7 deletions(-)

src/main.zig+4-7
......@@ -5251,7 +5251,7 @@ const JitCmdOptions = struct {
52515251 capture: ?*[]u8 = null,
52525252 /// Send error bundles via std.zig.Server over stdout
52535253 server: bool = false,
5254 progress_node: std.Progress.Node = .{ .index = .none },
5254 progress_node: ?std.Progress.Node = null,
52555255};
52565256
52575257fn jitCmd(
......@@ -5261,12 +5261,9 @@ fn jitCmd(
52615261 options: JitCmdOptions,
52625262) !void {
52635263 const color: Color = .auto;
5264 const root_prog_node = if (options.progress_node.index != .none)
5265 options.progress_node
5266 else
5267 std.Progress.start(.{
5268 .disable_printing = (color == .off),
5269 });
5264 const root_prog_node = if (options.progress_node) |node| node else std.Progress.start(.{
5265 .disable_printing = (color == .off),
5266 });
52705267
52715268 const target_query: std.Target.Query = .{};
52725269 const resolved_target: Package.Module.ResolvedTarget = .{