Commit a90f07b5374723ff76ed2ea888e5515326650e64 | zig

author	Jacob Young <jacobly@ziglang.org> 2025-04-22 16:30:50-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-07-01 16:35:28-07:00
log	a90f07b5374723ff76ed2ea888e5515326650e64
tree	c4d0ff459d939890195f0db4e480159baf889440
parent	cf28736f0d9f70c801a3cc30293a98067bc96fa0

5 files changed, 20 insertions(+), 19 deletions(-)

lib/std/crypto/siphash.zig+3-3

...	@@ -249,7 +249,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)	...	@@ -249,7 +249,7 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
249	};	249	};
250	}	250	}
251		251
252	fn writeSplat(ctx: ?*anyopaque, data: []const []const u8, splat: usize) anyerror!usize {	252	fn writeSplat(ctx: ?*anyopaque, data: []const []const u8, splat: usize) std.io.Writer.Error!usize {
253	const self: *Self = @alignCast(@ptrCast(ctx));	253	const self: *Self = @alignCast(@ptrCast(ctx));
254	var len: usize = 0;	254	var len: usize = 0;
255	for (data[0 .. data.len - 1]) \|slice\| {	255	for (data[0 .. data.len - 1]) \|slice\| {
...	@@ -271,14 +271,14 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)	...	@@ -271,14 +271,14 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
271	limit: std.io.Writer.Limit,	271	limit: std.io.Writer.Limit,
272	headers_and_trailers: []const []const u8,	272	headers_and_trailers: []const []const u8,
273	headers_len: usize,	273	headers_len: usize,
274	) anyerror!usize {	274	) std.io.Writer.Error!usize {
275	_ = ctx;	275	_ = ctx;
276	_ = file;	276	_ = file;
277	_ = offset;	277	_ = offset;
278	_ = limit;	278	_ = limit;
279	_ = headers_and_trailers;	279	_ = headers_and_trailers;
280	_ = headers_len;	280	_ = headers_len;
281	return error.Unimplemented;	281	@panic("TODO");
282	}	282	}
283	};	283	};
284	}	284	}

src/link/Coff.zig+5-2

 @@ -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| {
+    var fw = coff.base.file.?.writer();
-        return diags.fail("failed to write: {s}", .{@errorName(err)});
+    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.?)}),
     };
 }

src/link/Elf.zig+5-2

 @@ -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| {
+    var fw = elf_file.base.file.?.writer();
-        return diags.fail("failed to write: {s}", .{@errorName(err)});
+    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.?)}),
     };
 }

src/link/MachO.zig+5-2

 @@ -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| {
+    var fw = macho_file.base.file.?.writer();
-        return diags.fail("failed to write: {s}", .{@errorName(err)});
+    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.?)}),
     };
 }

src/main.zig+2-10

 @@ -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 };
-        .allocator = gpa,
-        .read_buffer_size = 0x4000,
-        .write_buffer_size = 0x4000,
-    };
     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 = .{
+    var http_client: std.http.Client = .{ .allocator = gpa };
-        .allocator = gpa,
-        .read_buffer_size = 0x4000,
-        .write_buffer_size = 0x4000,
-    };
     defer http_client.deinit();
     try http_client.initDefaultProxies(arena);