authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-01-26 16:25:58-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-01-30 12:10:01-08:00
log351a3dd997ec99589e0689e631625551adc34422
treeac805cbf258987a5cffac8e2f6025843ff7fcbed
parenta68cb81a843934094cb55033ca39e6bebfdacce0

std.Io.Threaded: resolve merge conflicts

1 files changed, 1 insertions(+), 2 deletions(-)

lib/std/Io/Threaded.zig+1-2
...@@ -2459,7 +2459,6 @@ fn futexWake(userdata: ?*anyopaque, ptr: *const u32, max_waiters: u32) void {...@@ -2459,7 +2459,6 @@ fn futexWake(userdata: ?*anyopaque, ptr: *const u32, max_waiters: u32) void {
24592459
2460fn operate(userdata: ?*anyopaque, op: *Io.Operation) Io.Cancelable!void {2460fn operate(userdata: ?*anyopaque, op: *Io.Operation) Io.Cancelable!void {
2461 const t: *Threaded = @ptrCast(@alignCast(userdata));2461 const t: *Threaded = @ptrCast(@alignCast(userdata));
2462 _ = t;
2463 switch (op.*) {2462 switch (op.*) {
2464 .noop => |*o| {2463 .noop => |*o| {
2465 _ = o.status.unstarted;2464 _ = o.status.unstarted;
...@@ -2467,7 +2466,7 @@ fn operate(userdata: ?*anyopaque, op: *Io.Operation) Io.Cancelable!void {...@@ -2467,7 +2466,7 @@ fn operate(userdata: ?*anyopaque, op: *Io.Operation) Io.Cancelable!void {
2467 },2466 },
2468 .file_read_streaming => |*o| {2467 .file_read_streaming => |*o| {
2469 _ = o.status.unstarted;2468 _ = o.status.unstarted;
2470 o.status = .{ .result = fileReadStreaming(o.file, o.data) catch |err| switch (err) {2469 o.status = .{ .result = fileReadStreaming(t, o.file, o.data) catch |err| switch (err) {
2471 error.Canceled => |e| return e,2470 error.Canceled => |e| return e,
2472 else => |e| e,2471 else => |e| e,
2473 } };2472 } };