From 01b580e75d2d57e315545f63cbea51ebdaaa54d4 Mon Sep 17 00:00:00 2001
From: Jacob Young <jacobly0@users.noreply.github.com>
Date: Wed, 7 May 2025 23:35:28 -0400
Subject: [PATCH] fix compile errors building the compiler

---
 lib/std/io/BufferedReader.zig | 6 +++---
 src/Compilation.zig           | 4 ++--
 src/Sema.zig                  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/std/io/BufferedReader.zig b/lib/std/io/BufferedReader.zig
index 4437bd931b..52a3d68696 100644
--- a/lib/std/io/BufferedReader.zig
+++ b/lib/std/io/BufferedReader.zig
@@ -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()) {
diff --git a/src/Compilation.zig b/src/Compilation.zig
index 42e8f78e18..bbcdc4b83a 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -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) },
diff --git a/src/Sema.zig b/src/Sema.zig
index 300c7e6625..8b5cdaee3e 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -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)});
         }
     }