| author |  Jacob Young <jacobly@ziglang.org> 2025-05-07 23:35:28-04:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2025-07-01 16:35:29-07:00 |
| log | 01b580e75d2d57e315545f63cbea51ebdaaa54d4 |
| tree | 595a4286e6c4ce436663c8bbb48392adf10ef9f1 |
| parent | 4607770a5792006d71e63e3f0f2a0fe9cecb07af |
fix compile errors building the compiler
3 files changed, 7 insertions(+), 7 deletions(-)
lib- std
lib/std/io/BufferedReader.zig+3-3
| ... | @@ -661,7 +661,7 @@ pub fn readDelimiterEnding( | ... | @@ -661,7 +661,7 @@ pub fn readDelimiterEnding( |
| 661 | br: *BufferedReader, | 661 | br: *BufferedReader, |
| 662 | bw: *BufferedWriter, | 662 | bw: *BufferedWriter, |
| 663 | delimiter: u8, | 663 | delimiter: u8, |
| 664 | ) Reader.RwAllError!usize { | 664 | ) Reader.RwRemainingError!usize { |
| 665 | const amount, const to = try br.readAny(bw, delimiter, .unlimited); | 665 | const amount, const to = try br.readAny(bw, delimiter, .unlimited); |
| 666 | return switch (to) { | 666 | return switch (to) { |
| 667 | .delimiter, .end => amount, | 667 | .delimiter, .end => amount, |
| ... | @@ -669,7 +669,7 @@ pub fn readDelimiterEnding( | ... | @@ -669,7 +669,7 @@ pub fn readDelimiterEnding( |
| 669 | }; | 669 | }; |
| 670 | } | 670 | } |
| 671 | 671 | ||
| 672 | pub const StreamDelimiterLimitedError = Reader.RwAllError || error{ | 672 | pub const StreamDelimiterLimitedError = Reader.RwRemainingError || error{ |
| 673 | /// Stream ended before the delimiter was found. | 673 | /// Stream ended before the delimiter was found. |
| 674 | EndOfStream, | 674 | EndOfStream, |
| 675 | /// The delimiter was not found within the limit. | 675 | /// The delimiter was not found within the limit. |
| ... | @@ -699,7 +699,7 @@ fn readAny( | ... | @@ -699,7 +699,7 @@ fn readAny( |
| 699 | bw: *BufferedWriter, | 699 | bw: *BufferedWriter, |
| 700 | delimiter: ?u8, | 700 | delimiter: ?u8, |
| 701 | limit: Reader.Limit, | 701 | limit: Reader.Limit, |
| 702 | ) Reader.RwAllError!struct { usize, enum { delimiter, limit, end } } { | 702 | ) Reader.RwRemainingError!struct { usize, enum { delimiter, limit, end } } { |
| 703 | var amount: usize = 0; | 703 | var amount: usize = 0; |
| 704 | var remaining = limit; | 704 | var remaining = limit; |
| 705 | while (remaining.nonzero()) { | 705 | while (remaining.nonzero()) { |
src/Compilation.zig+2-2
| ... | @@ -1006,7 +1006,7 @@ pub const CObject = struct { | ... | @@ -1006,7 +1006,7 @@ pub const CObject = struct { |
| 1006 | var bw: std.io.BufferedWriter = undefined; | 1006 | var bw: std.io.BufferedWriter = undefined; |
| 1007 | bw.initFixed(&buffer); | 1007 | bw.initFixed(&buffer); |
| 1008 | break :source_line try eb.addString( | 1008 | break :source_line try eb.addString( |
| 1009 | buffer[0 .. br.streamToDelimiterOrEnd(&bw, '\n') catch break :source_line 0], | 1009 | buffer[0 .. br.readDelimiterEnding(&bw, '\n') catch break :source_line 0], |
| 1010 | ); | 1010 | ); |
| 1011 | }; | 1011 | }; |
| 1012 | 1012 | ||
| ... | @@ -2701,7 +2701,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void { | ... | @@ -2701,7 +2701,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void { |
| 2701 | const is_hit = man.hit() catch |err| switch (err) { | 2701 | const is_hit = man.hit() catch |err| switch (err) { |
| 2702 | error.CacheCheckFailed => switch (man.diagnostic) { | 2702 | error.CacheCheckFailed => switch (man.diagnostic) { |
| 2703 | .none => unreachable, | 2703 | .none => unreachable, |
| 2704 | .manifest_create, .manifest_read, .manifest_lock, .manifest_seek => |e| return comp.setMiscFailure( | 2704 | .manifest_create, .manifest_read, .manifest_lock => |e| return comp.setMiscFailure( |
| 2705 | .check_whole_cache, | 2705 | .check_whole_cache, |
| 2706 | "failed to check cache: {s} {s}", | 2706 | "failed to check cache: {s} {s}", |
| 2707 | .{ @tagName(man.diagnostic), @errorName(e) }, | 2707 | .{ @tagName(man.diagnostic), @errorName(e) }, |
src/Sema.zig+2-2
| ... | @@ -5912,8 +5912,8 @@ fn zirCompileLog( | ... | @@ -5912,8 +5912,8 @@ fn zirCompileLog( |
| 5912 | const gpa = zcu.gpa; | 5912 | const gpa = zcu.gpa; |
| 5913 | 5913 | ||
| 5914 | var aw: std.io.AllocatingWriter = undefined; | 5914 | var aw: std.io.AllocatingWriter = undefined; |
| 5915 | const bw = aw.init(sema.gpa); | ||
| 5916 | defer aw.deinit(); | 5915 | defer aw.deinit(); |
| 5916 | const bw = &aw.buffered_writer; | ||
| 5917 | 5917 | ||
| 5918 | const extra = sema.code.extraData(Zir.Inst.NodeMultiOp, extended.operand); | 5918 | const extra = sema.code.extraData(Zir.Inst.NodeMultiOp, extended.operand); |
| 5919 | const src_node = extra.data.src_node; | 5919 | const src_node = extra.data.src_node; |
| ... | @@ -22360,7 +22360,7 @@ fn ptrFromIntVal( | ... | @@ -22360,7 +22360,7 @@ fn ptrFromIntVal( |
| 22360 | addr; | 22360 | addr; |
| 22361 | 22361 | ||
| 22362 | if (!ptr_align.check(masked_addr)) { | 22362 | if (!ptr_align.check(masked_addr)) { |
| 22363 | return sema.fail(block, operand_src, "pointer type '{}' requires aligned address", .{ptr_ty.fmt(pt)}); | 22363 | return sema.fail(block, operand_src, "pointer type '{f}' requires aligned address", .{ptr_ty.fmt(pt)}); |
| 22364 | } | 22364 | } |
| 22365 | } | 22365 | } |
| 22366 | 22366 |