authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-15 23:48:33-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-15 23:48:33-07:00
log32ff9d802b6337bc10765d879cfd52e6b78ea532
treeb4162159535fb16464ca47ad85924cf2a0954ff7
parent09c954a663ffee83b7aac2a22a56e3e4effc8360

sync

1 files changed, 6 insertions(+), 6 deletions(-)

lib/std/zig/AstGen.zig+6-6
......@@ -11291,7 +11291,7 @@ fn parseStrLit(
1129111291 const result = r: {
1129211292 var aw: std.io.Writer.Allocating = .fromArrayList(astgen.gpa, buf);
1129311293 defer buf.* = aw.toArrayList();
11294 break :r std.zig.string_literal.parseWrite(&aw.interface, raw_string) catch |err| switch (err) {
11294 break :r std.zig.string_literal.parseWrite(&aw.writer, raw_string) catch |err| switch (err) {
1129511295 error.WriteFailed => return error.OutOfMemory,
1129611296 };
1129711297 };
......@@ -13741,7 +13741,7 @@ fn lowerAstErrors(astgen: *AstGen) error{OutOfMemory}!void {
1374113741
1374213742 var msg: std.io.Writer.Allocating = .init(gpa);
1374313743 defer msg.deinit();
13744 const msg_bw = &msg.interface;
13744 const msg_w = &msg.writer;
1374513745
1374613746 var notes: std.ArrayListUnmanaged(u32) = .empty;
1374713747 defer notes.deinit(gpa);
......@@ -13775,19 +13775,19 @@ fn lowerAstErrors(astgen: *AstGen) error{OutOfMemory}!void {
1377513775 .extra = .{ .offset = bad_off },
1377613776 };
1377713777 msg.clearRetainingCapacity();
13778 tree.renderError(ast_err, msg_bw) catch return error.OutOfMemory;
13778 tree.renderError(ast_err, msg_w) catch return error.OutOfMemory;
1377913779 return try astgen.appendErrorTokNotesOff(tok, bad_off, "{s}", .{msg.getWritten()}, notes.items);
1378013780 }
1378113781
1378213782 var cur_err = tree.errors[0];
1378313783 for (tree.errors[1..]) |err| {
1378413784 if (err.is_note) {
13785 tree.renderError(err, msg_bw) catch return error.OutOfMemory;
13785 tree.renderError(err, msg_w) catch return error.OutOfMemory;
1378613786 try notes.append(gpa, try astgen.errNoteTok(err.token, "{s}", .{msg.getWritten()}));
1378713787 } else {
1378813788 // Flush error
1378913789 const extra_offset = tree.errorOffset(cur_err);
13790 tree.renderError(cur_err, msg_bw) catch return error.OutOfMemory;
13790 tree.renderError(cur_err, msg_w) catch return error.OutOfMemory;
1379113791 try astgen.appendErrorTokNotesOff(cur_err.token, extra_offset, "{s}", .{msg.getWritten()}, notes.items);
1379213792 notes.clearRetainingCapacity();
1379313793 cur_err = err;
......@@ -13801,7 +13801,7 @@ fn lowerAstErrors(astgen: *AstGen) error{OutOfMemory}!void {
1380113801
1380213802 // Flush error
1380313803 const extra_offset = tree.errorOffset(cur_err);
13804 tree.renderError(cur_err, msg_bw) catch return error.OutOfMemory;
13804 tree.renderError(cur_err, msg_w) catch return error.OutOfMemory;
1380513805 try astgen.appendErrorTokNotesOff(cur_err.token, extra_offset, "{s}", .{msg.getWritten()}, notes.items);
1380613806}
1380713807