| author |  Andrew Kelley <andrew@ziglang.org> 2026-09-25 12:07:52-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2026-09-25 12:07:52-07:00 |
| log | 50cf87f8fc01be98ec6f12ed954fbbcef0156a0d |
| tree | f84922cc291af22c049fb3281148de4f8157248d |
| parent | d09c1aef02788bcea0a3e3b0f7507c4f3e823295 |
update callsites to std.zig.Client.serveErrorBundle
now it has to include the message tag4 files changed, 11 insertions(+), 11 deletions(-)
lib
compiler
- objcopy.zig
resinator
translate-c
src
lib/compiler/objcopy.zig+2-2
| ... | @@ -234,9 +234,9 @@ fn cmdObjCopy(arena: Allocator, io: Io, args: []const []const u8) !void { | ... | @@ -234,9 +234,9 @@ fn cmdObjCopy(arena: Allocator, io: Io, args: []const []const u8) !void { |
| 234 | // The build system already knows what the output is at this point, we | 234 | // The build system already knows what the output is at this point, we |
| 235 | // only need to communicate that the process has finished. | 235 | // only need to communicate that the process has finished. |
| 236 | // Use the empty error bundle to indicate that the update is done. | 236 | // Use the empty error bundle to indicate that the update is done. |
| 237 | try server.serveErrorBundle(std.zig.ErrorBundle.empty); | 237 | try server.serveErrorBundle(.error_bundle, std.zig.ErrorBundle.empty); |
| 238 | }, | 238 | }, |
| 239 | else => fatal("unsupported message: {s}", .{@tagName(hdr.tag)}), | 239 | else => fatal("unsupported message: {t}", .{hdr.tag}), |
| 240 | } | 240 | } |
| 241 | } | 241 | } |
| 242 | } | 242 | } |
lib/compiler/resinator/main.zig+4-4
| ... | @@ -704,7 +704,7 @@ const ErrorHandler = union(enum) { | ... | @@ -704,7 +704,7 @@ const ErrorHandler = union(enum) { |
| 704 | var error_bundle = try cliDiagnosticsToErrorBundle(allocator, diagnostics); | 704 | var error_bundle = try cliDiagnosticsToErrorBundle(allocator, diagnostics); |
| 705 | defer error_bundle.deinit(allocator); | 705 | defer error_bundle.deinit(allocator); |
| 706 | 706 | ||
| 707 | try server.serveErrorBundle(error_bundle); | 707 | try server.serveErrorBundle(.error_bundle, error_bundle); |
| 708 | }, | 708 | }, |
| 709 | .stderr => return diagnostics.renderToStderr(io, args), | 709 | .stderr => return diagnostics.renderToStderr(io, args), |
| 710 | } | 710 | } |
| ... | @@ -726,7 +726,7 @@ const ErrorHandler = union(enum) { | ... | @@ -726,7 +726,7 @@ const ErrorHandler = union(enum) { |
| 726 | ); | 726 | ); |
| 727 | defer error_bundle.deinit(allocator); | 727 | defer error_bundle.deinit(allocator); |
| 728 | 728 | ||
| 729 | try server.serveErrorBundle(error_bundle); | 729 | try server.serveErrorBundle(.error_bundle, error_bundle); |
| 730 | }, | 730 | }, |
| 731 | .stderr => { | 731 | .stderr => { |
| 732 | // aro errors have already been emitted | 732 | // aro errors have already been emitted |
| ... | @@ -751,7 +751,7 @@ const ErrorHandler = union(enum) { | ... | @@ -751,7 +751,7 @@ const ErrorHandler = union(enum) { |
| 751 | var error_bundle = try diagnosticsToErrorBundle(allocator, source, diagnostics, mappings); | 751 | var error_bundle = try diagnosticsToErrorBundle(allocator, source, diagnostics, mappings); |
| 752 | defer error_bundle.deinit(allocator); | 752 | defer error_bundle.deinit(allocator); |
| 753 | 753 | ||
| 754 | try server.serveErrorBundle(error_bundle); | 754 | try server.serveErrorBundle(.error_bundle, error_bundle); |
| 755 | }, | 755 | }, |
| 756 | .stderr => return diagnostics.renderToStderr(io, cwd, source, mappings), | 756 | .stderr => return diagnostics.renderToStderr(io, cwd, source, mappings), |
| 757 | } | 757 | } |
| ... | @@ -773,7 +773,7 @@ const ErrorHandler = union(enum) { | ... | @@ -773,7 +773,7 @@ const ErrorHandler = union(enum) { |
| 773 | var error_bundle = try errorStringToErrorBundle(allocator, format, args); | 773 | var error_bundle = try errorStringToErrorBundle(allocator, format, args); |
| 774 | defer error_bundle.deinit(allocator); | 774 | defer error_bundle.deinit(allocator); |
| 775 | 775 | ||
| 776 | try server.serveErrorBundle(error_bundle); | 776 | try server.serveErrorBundle(.error_bundle, error_bundle); |
| 777 | }, | 777 | }, |
| 778 | .stderr => { | 778 | .stderr => { |
| 779 | const stderr = try io.lockStderr(&.{}, null); | 779 | const stderr = try io.lockStderr(&.{}, null); |
lib/compiler/translate-c/main.zig+1-1
| ... | @@ -105,7 +105,7 @@ fn serveErrorBundle(arena: std.mem.Allocator, io: Io, diagnostics: *const aro.Di | ... | @@ -105,7 +105,7 @@ fn serveErrorBundle(arena: std.mem.Allocator, io: Io, diagnostics: *const aro.Di |
| 105 | .out = &stdout_writer.interface, | 105 | .out = &stdout_writer.interface, |
| 106 | .in = undefined, | 106 | .in = undefined, |
| 107 | }; | 107 | }; |
| 108 | try server.serveErrorBundle(error_bundle); | 108 | try server.serveErrorBundle(.error_bundle, error_bundle); |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | pub const usage = | 111 | pub const usage = |
src/main.zig+4-4
| ... | @@ -4453,7 +4453,7 @@ fn serve( | ... | @@ -4453,7 +4453,7 @@ fn serve( |
| 4453 | } | 4453 | } |
| 4454 | 4454 | ||
| 4455 | if (output.errors.errorMessageCount() != 0) { | 4455 | if (output.errors.errorMessageCount() != 0) { |
| 4456 | try server.serveErrorBundle(output.errors); | 4456 | try server.serveErrorBundle(.error_bundle, output.errors); |
| 4457 | } else { | 4457 | } else { |
| 4458 | try server.serveEmitDigest(&output.digest, .{ | 4458 | try server.serveEmitDigest(&output.digest, .{ |
| 4459 | .flags = .{ .cache_hit = output.cache_hit }, | 4459 | .flags = .{ .cache_hit = output.cache_hit }, |
| ... | @@ -4611,7 +4611,7 @@ fn serveUpdateResults(s: *Server, comp: *Compilation) !void { | ... | @@ -4611,7 +4611,7 @@ fn serveUpdateResults(s: *Server, comp: *Compilation) !void { |
| 4611 | } | 4611 | } |
| 4612 | 4612 | ||
| 4613 | if (error_bundle.errorMessageCount() > 0) { | 4613 | if (error_bundle.errorMessageCount() > 0) { |
| 4614 | try s.serveErrorBundle(error_bundle); | 4614 | try s.serveErrorBundle(.error_bundle, error_bundle); |
| 4615 | return; | 4615 | return; |
| 4616 | } | 4616 | } |
| 4617 | 4617 | ||
| ... | @@ -4622,7 +4622,7 @@ fn serveUpdateResults(s: *Server, comp: *Compilation) !void { | ... | @@ -4622,7 +4622,7 @@ fn serveUpdateResults(s: *Server, comp: *Compilation) !void { |
| 4622 | } | 4622 | } |
| 4623 | 4623 | ||
| 4624 | // Serve empty error bundle to indicate the update is done. | 4624 | // Serve empty error bundle to indicate the update is done. |
| 4625 | try s.serveErrorBundle(std.zig.ErrorBundle.empty); | 4625 | try s.serveErrorBundle(.error_bundle, std.zig.ErrorBundle.empty); |
| 4626 | } | 4626 | } |
| 4627 | 4627 | ||
| 4628 | fn runOrTest( | 4628 | fn runOrTest( |
| ... | @@ -5157,7 +5157,7 @@ fn jitCmdInner( | ... | @@ -5157,7 +5157,7 @@ fn jitCmdInner( |
| 5157 | var error_bundle = try comp.getAllErrorsAlloc(); | 5157 | var error_bundle = try comp.getAllErrorsAlloc(); |
| 5158 | defer error_bundle.deinit(comp.gpa); | 5158 | defer error_bundle.deinit(comp.gpa); |
| 5159 | if (error_bundle.errorMessageCount() > 0) { | 5159 | if (error_bundle.errorMessageCount() > 0) { |
| 5160 | try server.serveErrorBundle(error_bundle); | 5160 | try server.serveErrorBundle(.error_bundle, error_bundle); |
| 5161 | process.exit(2); | 5161 | process.exit(2); |
| 5162 | } | 5162 | } |
| 5163 | } else { | 5163 | } else { |