Commit 44389253c2c3bd47c2c741aa6c804d18d1642ee7 | zig

author	Andrew Kelley <andrew@ziglang.org> 2024-05-27 13:51:16-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-05-27 20:56:49-07:00
log	44389253c2c3bd47c2c741aa6c804d18d1642ee7
tree	97d48a74cfd0389ef30907a6e248e7f998d0a56a
parent	2367a1ff846ef2f146d4f7e449044970d399046b

fix zig translate-c creating root progress node twice

2 files changed, 23 insertions(+), 13 deletions(-)

lib
- std
  - Progress.zig
src
- main.zig

lib/std/Progress.zig+4-4

src/main.zig+19-9

 @@ -3404,15 +3404,15 @@ fn buildOutputType(
         },
     }
-    if (arg_mode == .translate_c) {
-        return cmdTranslateC(comp, arena, null);
-    }
     const root_prog_node = std.Progress.start(.{
         .disable_printing = (color == .off),
     });
     defer root_prog_node.end();
+    if (arg_mode == .translate_c) {
+        return cmdTranslateC(comp, arena, null, root_prog_node);
+    }
     updateModule(comp, color, root_prog_node) catch |err| switch (err) {
         error.SemanticAnalyzeFail => {
             assert(listen == .none);
 @@ -4048,7 +4048,7 @@ fn serve(
                     defer arena_instance.deinit();
                     const arena = arena_instance.allocator();
                     var output: Compilation.CImportResult = undefined;
-                    try cmdTranslateC(comp, arena, &output);
+                    try cmdTranslateC(comp, arena, &output, main_progress_node);
                     defer output.deinit(gpa);
                     if (output.errors.errorMessageCount() != 0) {
                         try server.serveErrorBundle(output.errors);
 @@ -4398,7 +4398,12 @@ fn updateModule(comp: *Compilation, color: Color, prog_node: std.Progress.Node)
     }
 }
-fn cmdTranslateC(comp: *Compilation, arena: Allocator, fancy_output: ?*Compilation.CImportResult) !void {
+fn cmdTranslateC(
+    comp: *Compilation,
+    arena: Allocator,
+    fancy_output: ?*Compilation.CImportResult,
+    prog_node: std.Progress.Node,
+) !void {
     if (build_options.only_core_functionality) @panic("@translate-c is not available in a zig2.c build");
     const color: Color = .auto;
     assert(comp.c_source_files.len == 1);
 @@ -4459,6 +4464,7 @@ fn cmdTranslateC(comp: *Compilation, arena: Allocator, fancy_output: ?*Compilati
                     .root_src_path = "aro_translate_c.zig",
                     .depend_on_aro = true,
                     .capture = &stdout,
+                    .progress_node = prog_node,
                 });
                 break :f stdout;
             },
 @@ -5236,6 +5242,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 },
 };
 fn jitCmd(
 @@ -5245,9 +5252,12 @@ fn jitCmd(
     options: JitCmdOptions,
 ) !void {
     const color: Color = .auto;
-    const root_prog_node = std.Progress.start(.{
+    const root_prog_node = if (options.progress_node.index != .none)
-        .disable_printing = (color == .off),
+        options.progress_node
-    });
+    else
+        std.Progress.start(.{
+            .disable_printing = (color == .off),
+        });
     const target_query: std.Target.Query = .{};
     const resolved_target: Package.Module.ResolvedTarget = .{

...	@@ -128,12 +128,12 @@ pub const Node = struct {	...	@@ -128,12 +128,12 @@ pub const Node = struct {
128	}	128	}
129	};	129	};
130		130
131	const OptionalIndex = enum(u8) {	131	pub const OptionalIndex = enum(u8) {
132	none = std.math.maxInt(u8),	132	none = std.math.maxInt(u8),
133	/// Index into `node_storage`.	133	/// Index into `node_storage`.
134	_,	134	_,
135		135
136	fn unwrap(i: @This()) ?Index {	136	pub fn unwrap(i: @This()) ?Index {
137	if (i == .none) return null;	137	if (i == .none) return null;
138	return @enumFromInt(@intFromEnum(i));	138	return @enumFromInt(@intFromEnum(i));
139	}	139	}
...	@@ -145,7 +145,7 @@ pub const Node = struct {	...	@@ -145,7 +145,7 @@ pub const Node = struct {
145	};	145	};
146		146
147	/// Index into `node_storage`.	147	/// Index into `node_storage`.
148	const Index = enum(u8) {	148	pub const Index = enum(u8) {
149	_,	149	_,
150		150
151	fn toParent(i: @This()) Parent {	151	fn toParent(i: @This()) Parent {
...	@@ -154,7 +154,7 @@ pub const Node = struct {	...	@@ -154,7 +154,7 @@ pub const Node = struct {
154	return @enumFromInt(@intFromEnum(i));	154	return @enumFromInt(@intFromEnum(i));
155	}	155	}
156		156
157	fn toOptional(i: @This()) OptionalIndex {	157	pub fn toOptional(i: @This()) OptionalIndex {
158	return @enumFromInt(@intFromEnum(i));	158	return @enumFromInt(@intFromEnum(i));
159	}	159	}
160	};	160	};