From 5bdfe22092716d0e590979a678a3f5bf715439e9 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 27 May 2024 20:53:25 -0700 Subject: [PATCH] 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. --- src/main.zig | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main.zig b/src/main.zig index cec15a087f..22349dd36a 100644 --- a/src/main.zig +++ b/src/main.zig @@ -5251,7 +5251,7 @@ const JitCmdOptions = struct { capture: ?*[]u8 = null, /// Send error bundles via std.zig.Server over stdout server: bool = false, - progress_node: std.Progress.Node = .{ .index = .none }, + progress_node: ?std.Progress.Node = null, }; fn jitCmd( @@ -5261,12 +5261,9 @@ fn jitCmd( options: JitCmdOptions, ) !void { const color: Color = .auto; - const root_prog_node = if (options.progress_node.index != .none) - options.progress_node - else - std.Progress.start(.{ - .disable_printing = (color == .off), - }); + const root_prog_node = if (options.progress_node) |node| node else std.Progress.start(.{ + .disable_printing = (color == .off), + }); const target_query: std.Target.Query = .{}; const resolved_target: Package.Module.ResolvedTarget = .{