From a90f07b5374723ff76ed2ea888e5515326650e64 Mon Sep 17 00:00:00 2001
From: Jacob Young <jacobly0@users.noreply.github.com>
Date: Tue, 22 Apr 2025 16:30:50 -0400
Subject: [PATCH] fix more compiler errors

---
 lib/std/crypto/siphash.zig |  6 +++---
 src/link/Coff.zig          |  7 +++++--
 src/link/Elf.zig           |  7 +++++--
 src/link/MachO.zig         |  7 +++++--
 src/main.zig               | 12 ++----------
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/lib/std/crypto/siphash.zig b/lib/std/crypto/siphash.zig
index 5e89f268ad..a4cd904ba8 100644
--- a/lib/std/crypto/siphash.zig
+++ b/lib/std/crypto/siphash.zig
@@ -249,7 +249,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
             };
         }
 
-        fn writeSplat(ctx: ?*anyopaque, data: []const []const u8, splat: usize) anyerror!usize {
+        fn writeSplat(ctx: ?*anyopaque, data: []const []const u8, splat: usize) std.io.Writer.Error!usize {
             const self: *Self = @alignCast(@ptrCast(ctx));
             var len: usize = 0;
             for (data[0 .. data.len - 1]) |slice| {
@@ -271,14 +271,14 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
             limit: std.io.Writer.Limit,
             headers_and_trailers: []const []const u8,
             headers_len: usize,
-        ) anyerror!usize {
+        ) std.io.Writer.Error!usize {
             _ = ctx;
             _ = file;
             _ = offset;
             _ = limit;
             _ = headers_and_trailers;
             _ = headers_len;
-            return error.Unimplemented;
+            @panic("TODO");
         }
     };
 }
diff --git a/src/link/Coff.zig b/src/link/Coff.zig
index 2a445b02f3..4512ff91d2 100644
--- a/src/link/Coff.zig
+++ b/src/link/Coff.zig
@@ -3097,8 +3097,11 @@ const ImportTable = struct {
 fn pwriteAll(coff: *Coff, bytes: []const u8, offset: u64) error{LinkFailure}!void {
     const comp = coff.base.comp;
     const diags = &comp.link_diags;
-    coff.base.file.?.pwriteAll(bytes, offset) catch |err| {
-        return diags.fail("failed to write: {s}", .{@errorName(err)});
+    var fw = coff.base.file.?.writer();
+    fw.pos = offset;
+    var bw = fw.interface().unbuffered();
+    bw.writeAll(bytes) catch |err| switch (err) {
+        error.WriteFailed => return diags.fail("failed to write: {s}", .{@errorName(fw.err.?)}),
     };
 }
 
diff --git a/src/link/Elf.zig b/src/link/Elf.zig
index 14e8c03392..329aa268cf 100644
--- a/src/link/Elf.zig
+++ b/src/link/Elf.zig
@@ -4454,8 +4454,11 @@ pub fn stringTableLookup(strtab: []const u8, off: u32) [:0]const u8 {
 pub fn pwriteAll(elf_file: *Elf, bytes: []const u8, offset: u64) error{LinkFailure}!void {
     const comp = elf_file.base.comp;
     const diags = &comp.link_diags;
-    elf_file.base.file.?.pwriteAll(bytes, offset) catch |err| {
-        return diags.fail("failed to write: {s}", .{@errorName(err)});
+    var fw = elf_file.base.file.?.writer();
+    fw.pos = offset;
+    var bw = fw.interface().unbuffered();
+    bw.writeAll(bytes) catch |err| switch (err) {
+        error.WriteFailed => return diags.fail("failed to write: {s}", .{@errorName(fw.err.?)}),
     };
 }
 
diff --git a/src/link/MachO.zig b/src/link/MachO.zig
index b74599855d..38554dcbda 100644
--- a/src/link/MachO.zig
+++ b/src/link/MachO.zig
@@ -5330,8 +5330,11 @@ fn isReachable(atom: *const Atom, rel: Relocation, macho_file: *MachO) bool {
 pub fn pwriteAll(macho_file: *MachO, bytes: []const u8, offset: u64) error{LinkFailure}!void {
     const comp = macho_file.base.comp;
     const diags = &comp.link_diags;
-    macho_file.base.file.?.pwriteAll(bytes, offset) catch |err| {
-        return diags.fail("failed to write: {s}", .{@errorName(err)});
+    var fw = macho_file.base.file.?.writer();
+    fw.pos = offset;
+    var bw = fw.interface().unbuffered();
+    bw.writeAll(bytes) catch |err| switch (err) {
+        error.WriteFailed => return diags.fail("failed to write: {s}", .{@errorName(fw.err.?)}),
     };
 }
 
diff --git a/src/main.zig b/src/main.zig
index e810cbf402..7c4a3c1a63 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -5011,11 +5011,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
     var http_client: if (dev.env.supports(.fetch_command)) std.http.Client else struct {
         allocator: Allocator,
         fn deinit(_: @This()) void {}
-    } = .{
-        .allocator = gpa,
-        .read_buffer_size = 0x4000,
-        .write_buffer_size = 0x4000,
-    };
+    } = .{ .allocator = gpa };
     defer http_client.deinit();
 
     var unlazy_set: Package.Fetch.JobQueue.UnlazySet = .{};
@@ -6823,11 +6819,7 @@ fn cmdFetch(
     try thread_pool.init(.{ .allocator = gpa });
     defer thread_pool.deinit();
 
-    var http_client: std.http.Client = .{
-        .allocator = gpa,
-        .read_buffer_size = 0x4000,
-        .write_buffer_size = 0x4000,
-    };
+    var http_client: std.http.Client = .{ .allocator = gpa };
     defer http_client.deinit();
 
     try http_client.initDefaultProxies(arena);