authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2025-04-22 16:30:50-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-01 16:35:28-07:00
loga90f07b5374723ff76ed2ea888e5515326650e64
treec4d0ff459d939890195f0db4e480159baf889440
parentcf28736f0d9f70c801a3cc30293a98067bc96fa0

fix more compiler errors


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)
249249 };
250250 }
251251
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 {
253253 const self: *Self = @alignCast(@ptrCast(ctx));
254254 var len: usize = 0;
255255 for (data[0 .. data.len - 1]) |slice| {
......@@ -271,14 +271,14 @@ fn SipHash(comptime T: type, comptime c_rounds: usize, comptime d_rounds: usize)
271271 limit: std.io.Writer.Limit,
272272 headers_and_trailers: []const []const u8,
273273 headers_len: usize,
274 ) anyerror!usize {
274 ) std.io.Writer.Error!usize {
275275 _ = ctx;
276276 _ = file;
277277 _ = offset;
278278 _ = limit;
279279 _ = headers_and_trailers;
280280 _ = headers_len;
281 return error.Unimplemented;
281 @panic("TODO");
282282 }
283283 };
284284}
src/link/Coff.zig+5-2
......@@ -3097,8 +3097,11 @@ const ImportTable = struct {
30973097fn pwriteAll(coff: *Coff, bytes: []const u8, offset: u64) error{LinkFailure}!void {
30983098 const comp = coff.base.comp;
30993099 const diags = &comp.link_diags;
3100 coff.base.file.?.pwriteAll(bytes, offset) catch |err| {
3101 return diags.fail("failed to write: {s}", .{@errorName(err)});
3100 var fw = coff.base.file.?.writer();
3101 fw.pos = offset;
3102 var bw = fw.interface().unbuffered();
3103 bw.writeAll(bytes) catch |err| switch (err) {
3104 error.WriteFailed => return diags.fail("failed to write: {s}", .{@errorName(fw.err.?)}),
31023105 };
31033106}
31043107
src/link/Elf.zig+5-2
......@@ -4454,8 +4454,11 @@ pub fn stringTableLookup(strtab: []const u8, off: u32) [:0]const u8 {
44544454pub fn pwriteAll(elf_file: *Elf, bytes: []const u8, offset: u64) error{LinkFailure}!void {
44554455 const comp = elf_file.base.comp;
44564456 const diags = &comp.link_diags;
4457 elf_file.base.file.?.pwriteAll(bytes, offset) catch |err| {
4458 return diags.fail("failed to write: {s}", .{@errorName(err)});
4457 var fw = elf_file.base.file.?.writer();
4458 fw.pos = offset;
4459 var bw = fw.interface().unbuffered();
4460 bw.writeAll(bytes) catch |err| switch (err) {
4461 error.WriteFailed => return diags.fail("failed to write: {s}", .{@errorName(fw.err.?)}),
44594462 };
44604463}
44614464
src/link/MachO.zig+5-2
......@@ -5330,8 +5330,11 @@ fn isReachable(atom: *const Atom, rel: Relocation, macho_file: *MachO) bool {
53305330pub fn pwriteAll(macho_file: *MachO, bytes: []const u8, offset: u64) error{LinkFailure}!void {
53315331 const comp = macho_file.base.comp;
53325332 const diags = &comp.link_diags;
5333 macho_file.base.file.?.pwriteAll(bytes, offset) catch |err| {
5334 return diags.fail("failed to write: {s}", .{@errorName(err)});
5333 var fw = macho_file.base.file.?.writer();
5334 fw.pos = offset;
5335 var bw = fw.interface().unbuffered();
5336 bw.writeAll(bytes) catch |err| switch (err) {
5337 error.WriteFailed => return diags.fail("failed to write: {s}", .{@errorName(fw.err.?)}),
53355338 };
53365339}
53375340
src/main.zig+2-10
......@@ -5011,11 +5011,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
50115011 var http_client: if (dev.env.supports(.fetch_command)) std.http.Client else struct {
50125012 allocator: Allocator,
50135013 fn deinit(_: @This()) void {}
5014 } = .{
5015 .allocator = gpa,
5016 .read_buffer_size = 0x4000,
5017 .write_buffer_size = 0x4000,
5018 };
5014 } = .{ .allocator = gpa };
50195015 defer http_client.deinit();
50205016
50215017 var unlazy_set: Package.Fetch.JobQueue.UnlazySet = .{};
......@@ -6823,11 +6819,7 @@ fn cmdFetch(
68236819 try thread_pool.init(.{ .allocator = gpa });
68246820 defer thread_pool.deinit();
68256821
6826 var http_client: std.http.Client = .{
6827 .allocator = gpa,
6828 .read_buffer_size = 0x4000,
6829 .write_buffer_size = 0x4000,
6830 };
6822 var http_client: std.http.Client = .{ .allocator = gpa };
68316823 defer http_client.deinit();
68326824
68336825 try http_client.initDefaultProxies(arena);