mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compile errors building the compiler

Browse Source
This commit is contained in:
Jacob Young 2025-05-07 23:35:28 -04:00 committed by Andrew Kelley
parent 4607770a57
commit 01b580e75d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/std/io/BufferedReader.zig
View File

@ -661,7 +661,7 @@ pub fn readDelimiterEnding(
br: *BufferedReader,
bw: *BufferedWriter,
delimiter: u8,
) Reader.RwAllError!usize {
) Reader.RwRemainingError!usize {
const amount, const to = try br.readAny(bw, delimiter, .unlimited);
return switch (to) {
.delimiter, .end => amount,
@ -669,7 +669,7 @@ pub fn readDelimiterEnding(
};
}
pub const StreamDelimiterLimitedError = Reader.RwAllError || error{
pub const StreamDelimiterLimitedError = Reader.RwRemainingError || error{
/// Stream ended before the delimiter was found.
EndOfStream,
/// The delimiter was not found within the limit.
@ -699,7 +699,7 @@ fn readAny(
bw: *BufferedWriter,
delimiter: ?u8,
limit: Reader.Limit,
) Reader.RwAllError!struct { usize, enum { delimiter, limit, end } } {
) Reader.RwRemainingError!struct { usize, enum { delimiter, limit, end } } {
var amount: usize = 0;
var remaining = limit;
while (remaining.nonzero()) {

4
src/Compilation.zig
View File

@ -1006,7 +1006,7 @@ pub const CObject = struct {
var bw: std.io.BufferedWriter = undefined;
bw.initFixed(&buffer);
break :source_line try eb.addString(
buffer[0 .. br.streamToDelimiterOrEnd(&bw, '\n') catch break :source_line 0],
buffer[0 .. br.readDelimiterEnding(&bw, '\n') catch break :source_line 0],
);
};
@ -2701,7 +2701,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
const is_hit = man.hit() catch |err| switch (err) {
error.CacheCheckFailed => switch (man.diagnostic) {
.none => unreachable,
.manifest_create, .manifest_read, .manifest_lock, .manifest_seek => |e| return comp.setMiscFailure(
.manifest_create, .manifest_read, .manifest_lock => |e| return comp.setMiscFailure(
.check_whole_cache,
"failed to check cache: {s} {s}",
.{ @tagName(man.diagnostic), @errorName(e) },

4
src/Sema.zig
View File

@ -5912,8 +5912,8 @@ fn zirCompileLog(
const gpa = zcu.gpa;
var aw: std.io.AllocatingWriter = undefined;
const bw = aw.init(sema.gpa);
defer aw.deinit();
const bw = &aw.buffered_writer;
const extra = sema.code.extraData(Zir.Inst.NodeMultiOp, extended.operand);
const src_node = extra.data.src_node;
@ -22360,7 +22360,7 @@ fn ptrFromIntVal(
addr;
if (!ptr_align.check(masked_addr)) {
return sema.fail(block, operand_src, "pointer type '{}' requires aligned address", .{ptr_ty.fmt(pt)});
return sema.fail(block, operand_src, "pointer type '{f}' requires aligned address", .{ptr_ty.fmt(pt)});
}
}