Commit 0937992a14e9557da7d753f3c38070fe57583e33 | zig | Meg's Mirrors

author	Andrew Kelley <andrew@ziglang.org> 2024-05-27 11:20:42-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2024-05-27 20:56:49-07:00
log	0937992a14e9557da7d753f3c38070fe57583e33
tree	3b1d18184929654c35c4fc19a56f9645a4b89a49
parent	03073d6c7bf5f7cd1daf8941fcf72665563b46d4

resinator: update to new progress API

3 files changed, 4 insertions(+), 10 deletions(-)

lib
- compiler
  - resinator
    cli.zig
    errors.zig
    main.zig

lib/compiler/resinator/cli.zig+2-2

...	...	@@ -108,8 +108,8 @@ pub const Diagnostics = struct {
108	108	}
109	109
110	110	pub fn renderToStdErr(self: *Diagnostics, args: []const []const u8, config: std.io.tty.Config) void {
111		std.debug.getStderrMutex().lock();
112		defer std.debug.getStderrMutex().unlock();
	111	std.debug.lockStdErr();
	112	defer std.debug.unlockStdErr();
113	113	const stderr = std.io.getStdErr().writer();
114	114	self.renderToWriter(args, stderr, config) catch return;
115	115	}

lib/compiler/resinator/errors.zig+2-2

...	...	@@ -60,8 +60,8 @@ pub const Diagnostics = struct {
60	60	}
61	61
62	62	pub fn renderToStdErr(self: *Diagnostics, cwd: std.fs.Dir, source: []const u8, tty_config: std.io.tty.Config, source_mappings: ?SourceMappings) void {
63		std.debug.getStderrMutex().lock();
64		defer std.debug.getStderrMutex().unlock();
	63	std.debug.lockStdErr();
	64	defer std.debug.unlockStdErr();
65	65	const stderr = std.io.getStdErr().writer();
66	66	for (self.errors.items) \|err_details\| {
67	67	renderErrorMessage(self.allocator, stderr, tty_config, cwd, err_details, source, self.strings.items, source_mappings) catch return;

lib/compiler/resinator/main.zig-6

...	...	@@ -50,12 +50,6 @@ pub fn main() !void {
50	50	},
51	51	};
52	52
53		if (zig_integration) {
54		// Send progress with a special string to indicate that the building of the
55		// resinator binary is finished and we've moved on to actually compiling the .rc file
56		try error_handler.server.serveStringMessage(.progress, "<resinator>");
57		}
58
59	53	var options = options: {
60	54	var cli_diagnostics = cli.Diagnostics.init(allocator);
61	55	defer cli_diagnostics.deinit();