From 37316a3cf61a0b193003a19b44116da346c6cd3e Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 26 Jan 2026 16:25:58 -0800
Subject: [PATCH] std.Io.Threaded: resolve merge conflicts

---
 lib/std/Io/Threaded.zig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/std/Io/Threaded.zig b/lib/std/Io/Threaded.zig
index 4024263f4fc89b34e2df96084ce2b824c6553f13..e60959abd00f7f3dc107abae88534138e5d4d3a3 100644
--- a/lib/std/Io/Threaded.zig
+++ b/lib/std/Io/Threaded.zig
@@ -2459,7 +2459,6 @@ fn futexWake(userdata: ?*anyopaque, ptr: *const u32, max_waiters: u32) void {
 
 fn operate(userdata: ?*anyopaque, op: *Io.Operation) Io.Cancelable!void {
     const t: *Threaded = @ptrCast(@alignCast(userdata));
-    _ = t;
     switch (op.*) {
         .noop => |*o| {
             _ = o.status.unstarted;
@@ -2467,7 +2466,7 @@ fn operate(userdata: ?*anyopaque, op: *Io.Operation) Io.Cancelable!void {
         },
         .file_read_streaming => |*o| {
             _ = o.status.unstarted;
-            o.status = .{ .result = fileReadStreaming(o.file, o.data) catch |err| switch (err) {
+            o.status = .{ .result = fileReadStreaming(t, o.file, o.data) catch |err| switch (err) {
                 error.Canceled => |e| return e,
                 else => |e| e,
             } };
-- 
2.54.0