Commit aafddc2ea13e40a8262d9378aeca2e097a37ac03 | zig

build.zig+2-2

...	@@ -1604,12 +1604,12 @@ fn generateLangRef(b: *std.Build) std.Build.LazyPath {	...	@@ -1604,12 +1604,12 @@ fn generateLangRef(b: *std.Build) std.Build.LazyPath {
1604	b.build_root, @errorName(err),	1604	b.build_root, @errorName(err),
1605	});	1605	});
1606	};	1606	};
1607	defer dir.close();	1607	defer dir.close(io);
1608		1608
1609	var wf = b.addWriteFiles();	1609	var wf = b.addWriteFiles();
1610		1610
1611	var it = dir.iterateAssumeFirstIteration();	1611	var it = dir.iterateAssumeFirstIteration();
1612	while (it.next() catch @panic("failed to read dir")) \|entry\| {	1612	while (it.next(io) catch @panic("failed to read dir")) \|entry\| {
1613	if (std.mem.startsWith(u8, entry.name, ".") or entry.kind != .file)	1613	if (std.mem.startsWith(u8, entry.name, ".") or entry.kind != .file)
1614	continue;	1614	continue;
1615		1615

lib/compiler/aro/aro/Compilation.zig+6-2

 @@ -1639,8 +1639,10 @@ fn addSourceFromPathExtra(comp: *Compilation, path: []const u8, kind: Source.Kin
         return error.FileNotFound;
     }
+    const io = comp.io;
     const file = try comp.cwd.openFile(path, .{});
-    defer file.close();
+    defer file.close(io);
     return comp.addSourceFromFile(file, path, kind);
 }
 @@ -1971,8 +1973,10 @@ fn getPathContents(comp: *Compilation, path: []const u8, limit: Io.Limit) ![]u8
         return error.FileNotFound;
     }
+    const io = comp.io;
     const file = try comp.cwd.openFile(path, .{});
-    defer file.close();
+    defer file.close(io);
     return comp.getFileContents(file, limit);
 }

lib/compiler/aro/aro/Driver.zig+7-5

lib/compiler/aro/aro/Driver/Filesystem.zig+15-13

 @@ -1,8 +1,10 @@
-const std = @import("std");
-const mem = std.mem;
 const builtin = @import("builtin");
 const is_windows = builtin.os.tag == .windows;
+const std = @import("std");
+const Io = std.Io;
+const mem = std.std.mem;
 fn readFileFake(entries: []const Filesystem.Entry, path: []const u8, buf: []u8) ?[]const u8 {
     @branchHint(.cold);
     for (entries) |entry| {
 @@ -96,7 +98,7 @@ fn findProgramByNamePosix(name: []const u8, path: ?[]const u8, buf: []u8) ?[]con
 }
 pub const Filesystem = union(enum) {
-    real: std.fs.Dir,
+    real: std.Io.Dir,
     fake: []const Entry,
     const Entry = struct {
 @@ -121,7 +123,7 @@ pub const Filesystem = union(enum) {
             base: []const u8,
             i: usize = 0,
-            fn next(self: *@This()) !?std.fs.Dir.Entry {
+            fn next(self: *@This()) !?std.Io.Dir.Entry {
                 while (self.i < self.entries.len) {
                     const entry = self.entries[self.i];
                     self.i += 1;
 @@ -130,7 +132,7 @@ pub const Filesystem = union(enum) {
                         const remaining = entry.path[self.base.len + 1 ..];
                         if (std.mem.indexOfScalar(u8, remaining, std.fs.path.sep) != null) continue;
                         const extension = std.fs.path.extension(remaining);
-                        const kind: std.fs.Dir.Entry.Kind = if (extension.len == 0) .directory else .file;
+                        const kind: std.Io.Dir.Entry.Kind = if (extension.len == 0) .directory else .file;
                         return .{ .name = remaining, .kind = kind };
                     }
                 }
 @@ -140,7 +142,7 @@ pub const Filesystem = union(enum) {
     };
     const Dir = union(enum) {
-        dir: std.fs.Dir,
+        dir: std.Io.Dir,
         fake: FakeDir,
         pub fn iterate(self: Dir) Iterator {
 @@ -150,19 +152,19 @@ pub const Filesystem = union(enum) {
             };
         }
-        pub fn close(self: *Dir) void {
+        pub fn close(self: *Dir, io: Io) void {
             switch (self.*) {
-                .dir => |*d| d.close(),
+                .dir => |*d| d.close(io),
                 .fake => {},
             }
         }
     };
     const Iterator = union(enum) {
-        iterator: std.fs.Dir.Iterator,
+        iterator: std.Io.Dir.Iterator,
         fake: FakeDir.Iterator,
-        pub fn next(self: *Iterator) std.fs.Dir.Iterator.Error!?std.fs.Dir.Entry {
+        pub fn next(self: *Iterator) std.Io.Dir.Iterator.Error!?std.Io.Dir.Entry {
             return switch (self.*) {
                 .iterator => |*it| it.next(),
                 .fake => |*it| it.next(),
 @@ -208,11 +210,11 @@ pub const Filesystem = union(enum) {
     /// Read the file at `path` into `buf`.
     /// Returns null if any errors are encountered
     /// Otherwise returns a slice of `buf`. If the file is larger than `buf` partial contents are returned
-    pub fn readFile(fs: Filesystem, path: []const u8, buf: []u8) ?[]const u8 {
+    pub fn readFile(fs: Filesystem, io: Io, path: []const u8, buf: []u8) ?[]const u8 {
         return switch (fs) {
             .real => |cwd| {
                 const file = cwd.openFile(path, .{}) catch return null;
-                defer file.close();
+                defer file.close(io);
                 const bytes_read = file.readAll(buf) catch return null;
                 return buf[0..bytes_read];
 @@ -221,7 +223,7 @@ pub const Filesystem = union(enum) {
         };
     }
-    pub fn openDir(fs: Filesystem, dir_name: []const u8) std.fs.Dir.OpenError!Dir {
+    pub fn openDir(fs: Filesystem, dir_name: []const u8) std.Io.Dir.OpenError!Dir {
         return switch (fs) {
             .real => |cwd| .{ .dir = try cwd.openDir(dir_name, .{ .access_sub_paths = false, .iterate = true }) },
             .fake => |entries| .{ .fake = .{ .entries = entries, .path = dir_name } },

lib/compiler/aro/aro/Toolchain.zig+2-1

lib/compiler/objcopy.zig+2-2

...	@@ -152,7 +152,7 @@ fn cmdObjCopy(gpa: Allocator, arena: Allocator, args: []const []const u8) !void	...	@@ -152,7 +152,7 @@ fn cmdObjCopy(gpa: Allocator, arena: Allocator, args: []const []const u8) !void
152	const io = threaded.io();	152	const io = threaded.io();
153		153
154	const input_file = fs.cwd().openFile(input, .{}) catch \|err\| fatal("failed to open {s}: {t}", .{ input, err });	154	const input_file = fs.cwd().openFile(input, .{}) catch \|err\| fatal("failed to open {s}: {t}", .{ input, err });
155	defer input_file.close();	155	defer input_file.close(io);
156		156
157	const stat = input_file.stat() catch \|err\| fatal("failed to stat {s}: {t}", .{ input, err });	157	const stat = input_file.stat() catch \|err\| fatal("failed to stat {s}: {t}", .{ input, err });
158		158
...	@@ -180,7 +180,7 @@ fn cmdObjCopy(gpa: Allocator, arena: Allocator, args: []const []const u8) !void	...	@@ -180,7 +180,7 @@ fn cmdObjCopy(gpa: Allocator, arena: Allocator, args: []const []const u8) !void
180	const mode = if (out_fmt != .elf or only_keep_debug) fs.File.default_mode else stat.mode;	180	const mode = if (out_fmt != .elf or only_keep_debug) fs.File.default_mode else stat.mode;
181		181
182	var output_file = try fs.cwd().createFile(output, .{ .mode = mode });	182	var output_file = try fs.cwd().createFile(output, .{ .mode = mode });
183	defer output_file.close();	183	defer output_file.close(io);
184		184
185	var out = output_file.writer(&output_buffer);	185	var out = output_file.writer(&output_buffer);
186		186

lib/compiler/resinator/cli.zig+3-1

...	@@ -1991,6 +1991,8 @@ test "parse: input and output formats" {	...	@@ -1991,6 +1991,8 @@ test "parse: input and output formats" {
1991	}	1991	}
1992		1992
1993	test "maybeAppendRC" {	1993	test "maybeAppendRC" {
		1994	const io = std.testing.io;
		1995
1994	var tmp = std.testing.tmpDir(.{});	1996	var tmp = std.testing.tmpDir(.{});
1995	defer tmp.cleanup();	1997	defer tmp.cleanup();
1996		1998
...	@@ -2001,7 +2003,7 @@ test "maybeAppendRC" {	...	@@ -2001,7 +2003,7 @@ test "maybeAppendRC" {
2001	// Create the file so that it's found. In this scenario, .rc should not get	2003	// Create the file so that it's found. In this scenario, .rc should not get
2002	// appended.	2004	// appended.
2003	var file = try tmp.dir.createFile("foo", .{});	2005	var file = try tmp.dir.createFile("foo", .{});
2004	file.close();	2006	file.close(io);
2005	try options.maybeAppendRC(tmp.dir);	2007	try options.maybeAppendRC(tmp.dir);
2006	try std.testing.expectEqualStrings("foo", options.input_source.filename);	2008	try std.testing.expectEqualStrings("foo", options.input_source.filename);
2007		2009

lib/compiler/resinator/compile.zig+18-16

lib/compiler/resinator/errors.zig+2-2

...	@@ -1221,8 +1221,8 @@ const CorrespondingLines = struct {	...	@@ -1221,8 +1221,8 @@ const CorrespondingLines = struct {
1221	};	1221	};
1222	}	1222	}
1223		1223
1224	pub fn deinit(self: *CorrespondingLines) void {	1224	pub fn deinit(self: *CorrespondingLines, io: Io) void {
1225	self.file.close();	1225	self.file.close(io);
1226	}	1226	}
1227	};	1227	};
1228		1228

lib/compiler/resinator/main.zig+7-7

...	@@ -296,7 +296,7 @@ pub fn main() !void {	...	@@ -296,7 +296,7 @@ pub fn main() !void {
296	error.ParseError, error.CompileError => {	296	error.ParseError, error.CompileError => {
297	try error_handler.emitDiagnostics(gpa, std.fs.cwd(), final_input, &diagnostics, mapping_results.mappings);	297	try error_handler.emitDiagnostics(gpa, std.fs.cwd(), final_input, &diagnostics, mapping_results.mappings);
298	// Delete the output file on error	298	// Delete the output file on error
299	res_stream.cleanupAfterError();	299	res_stream.cleanupAfterError(io);
300	std.process.exit(1);	300	std.process.exit(1);
301	},	301	},
302	else => \|e\| return e,	302	else => \|e\| return e,
...	@@ -315,7 +315,7 @@ pub fn main() !void {	...	@@ -315,7 +315,7 @@ pub fn main() !void {
315	try error_handler.emitMessage(gpa, .err, "unable to create depfile '{s}': {s}", .{ depfile_path, @errorName(err) });	315	try error_handler.emitMessage(gpa, .err, "unable to create depfile '{s}': {s}", .{ depfile_path, @errorName(err) });
316	std.process.exit(1);	316	std.process.exit(1);
317	};	317	};
318	defer depfile.close();	318	defer depfile.close(io);
319		319
320	var depfile_buffer: [1024]u8 = undefined;	320	var depfile_buffer: [1024]u8 = undefined;
321	var depfile_writer = depfile.writer(&depfile_buffer);	321	var depfile_writer = depfile.writer(&depfile_buffer);
...	@@ -402,7 +402,7 @@ pub fn main() !void {	...	@@ -402,7 +402,7 @@ pub fn main() !void {
402	},	402	},
403	}	403	}
404	// Delete the output file on error	404	// Delete the output file on error
405	coff_stream.cleanupAfterError();	405	coff_stream.cleanupAfterError(io);
406	std.process.exit(1);	406	std.process.exit(1);
407	};	407	};
408		408
...	@@ -434,11 +434,11 @@ const IoStream = struct {	...	@@ -434,11 +434,11 @@ const IoStream = struct {
434	self.source.deinit(allocator);	434	self.source.deinit(allocator);
435	}	435	}
436		436
437	pub fn cleanupAfterError(self: *IoStream) void {	437	pub fn cleanupAfterError(self: *IoStream, io: Io) void {
438	switch (self.source) {	438	switch (self.source) {
439	.file => \|file\| {	439	.file => \|file\| {
440	// Delete the output file on error	440	// Delete the output file on error
441	file.close();	441	file.close(io);
442	// Failing to delete is not really a big deal, so swallow any errors	442	// Failing to delete is not really a big deal, so swallow any errors
443	std.fs.cwd().deleteFile(self.name) catch {};	443	std.fs.cwd().deleteFile(self.name) catch {};
444	},	444	},
...	@@ -465,9 +465,9 @@ const IoStream = struct {	...	@@ -465,9 +465,9 @@ const IoStream = struct {
465	}	465	}
466	}	466	}
467		467
468	pub fn deinit(self: *Source, allocator: Allocator) void {	468	pub fn deinit(self: *Source, allocator: Allocator, io: Io) void {
469	switch (self.*) {	469	switch (self.*) {
470	.file => \|file\| file.close(),	470	.file => \|file\| file.close(io),
471	.stdio => {},	471	.stdio => {},
472	.memory => \|*list\| list.deinit(allocator),	472	.memory => \|*list\| list.deinit(allocator),
473	.closed => {},	473	.closed => {},

lib/compiler/resinator/utils.zig+6-3

 @@ -1,6 +1,8 @@
-const std = @import("std");
 const builtin = @import("builtin");
+const std = @import("std");
+const Io = std.Io;
 pub const UncheckedSliceWriter = struct {
     const Self = @This();
 @@ -28,11 +30,12 @@ pub const UncheckedSliceWriter = struct {
 /// TODO: Remove once https://github.com/ziglang/zig/issues/5732 is addressed.
 pub fn openFileNotDir(
     cwd: std.fs.Dir,
+    io: Io,
     path: []const u8,
     flags: std.fs.File.OpenFlags,
 ) (std.fs.File.OpenError || std.fs.File.StatError)!std.fs.File {
-    const file = try cwd.openFile(path, flags);
+    const file = try cwd.openFile(io, path, flags);
-    errdefer file.close();
+    errdefer file.close(io);
     // https://github.com/ziglang/zig/issues/5732
     if (builtin.os.tag != .windows) {
         const stat = try file.stat();

lib/compiler/std-docs.zig+22-11

...	@@ -1,12 +1,14 @@	...	@@ -1,12 +1,14 @@
1	const builtin = @import("builtin");	1	const builtin = @import("builtin");
		2
2	const std = @import("std");	3	const std = @import("std");
		4	const Io = std.Io;
3	const mem = std.mem;	5	const mem = std.mem;
4	const Allocator = std.mem.Allocator;	6	const Allocator = std.mem.Allocator;
5	const assert = std.debug.assert;	7	const assert = std.debug.assert;
6	const Cache = std.Build.Cache;	8	const Cache = std.Build.Cache;
7		9
8	fn usage() noreturn {	10	fn usage() noreturn {
9	std.fs.File.stdout().writeAll(	11	std.Io.File.stdout().writeAll(
10	\\Usage: zig std [options]	12	\\Usage: zig std [options]
11	\\	13	\\
12	\\Options:	14	\\Options:
...	@@ -27,6 +29,10 @@ pub fn main() !void {	...	@@ -27,6 +29,10 @@ pub fn main() !void {
27	var general_purpose_allocator: std.heap.GeneralPurposeAllocator(.{}) = .init;	29	var general_purpose_allocator: std.heap.GeneralPurposeAllocator(.{}) = .init;
28	const gpa = general_purpose_allocator.allocator();	30	const gpa = general_purpose_allocator.allocator();
29		31
		32	var threaded: std.Io.Threaded = .init(gpa);
		33	defer threaded.deinit();
		34	const io = threaded.io();
		35
30	var argv = try std.process.argsWithAllocator(arena);	36	var argv = try std.process.argsWithAllocator(arena);
31	defer argv.deinit();	37	defer argv.deinit();
32	assert(argv.skip());	38	assert(argv.skip());
...	@@ -35,7 +41,7 @@ pub fn main() !void {	...	@@ -35,7 +41,7 @@ pub fn main() !void {
35	const global_cache_path = argv.next().?;	41	const global_cache_path = argv.next().?;
36		42
37	var lib_dir = try std.fs.cwd().openDir(zig_lib_directory, .{});	43	var lib_dir = try std.fs.cwd().openDir(zig_lib_directory, .{});
38	defer lib_dir.close();	44	defer lib_dir.close(io);
39		45
40	var listen_port: u16 = 0;	46	var listen_port: u16 = 0;
41	var force_open_browser: ?bool = null;	47	var force_open_browser: ?bool = null;
...	@@ -64,7 +70,7 @@ pub fn main() !void {	...	@@ -64,7 +70,7 @@ pub fn main() !void {
64	});	70	});
65	const port = http_server.listen_address.in.getPort();	71	const port = http_server.listen_address.in.getPort();
66	const url_with_newline = try std.fmt.allocPrint(arena, "http://127.0.0.1:{d}/\n", .{port});	72	const url_with_newline = try std.fmt.allocPrint(arena, "http://127.0.0.1:{d}/\n", .{port});
67	std.fs.File.stdout().writeAll(url_with_newline) catch {};	73	std.Io.File.stdout().writeAll(url_with_newline) catch {};
68	if (should_open_browser) {	74	if (should_open_browser) {
69	openBrowserTab(gpa, url_with_newline[0 .. url_with_newline.len - 1 :'\n']) catch \|err\| {	75	openBrowserTab(gpa, url_with_newline[0 .. url_with_newline.len - 1 :'\n']) catch \|err\| {
70	std.log.err("unable to open browser: {s}", .{@errorName(err)});	76	std.log.err("unable to open browser: {s}", .{@errorName(err)});
...	@@ -73,6 +79,7 @@ pub fn main() !void {	...	@@ -73,6 +79,7 @@ pub fn main() !void {
73		79
74	var context: Context = .{	80	var context: Context = .{
75	.gpa = gpa,	81	.gpa = gpa,
		82	.io = io,
76	.zig_exe_path = zig_exe_path,	83	.zig_exe_path = zig_exe_path,
77	.global_cache_path = global_cache_path,	84	.global_cache_path = global_cache_path,
78	.lib_dir = lib_dir,	85	.lib_dir = lib_dir,
...	@@ -83,14 +90,15 @@ pub fn main() !void {	...	@@ -83,14 +90,15 @@ pub fn main() !void {
83	const connection = try http_server.accept();	90	const connection = try http_server.accept();
84	_ = std.Thread.spawn(.{}, accept, .{ &context, connection }) catch \|err\| {	91	_ = std.Thread.spawn(.{}, accept, .{ &context, connection }) catch \|err\| {
85	std.log.err("unable to accept connection: {s}", .{@errorName(err)});	92	std.log.err("unable to accept connection: {s}", .{@errorName(err)});
86	connection.stream.close();	93	connection.stream.close(io);
87	continue;	94	continue;
88	};	95	};
89	}	96	}
90	}	97	}
91		98
92	fn accept(context: *Context, connection: std.net.Server.Connection) void {	99	fn accept(context: *Context, connection: std.net.Server.Connection) void {
93	defer connection.stream.close();	100	const io = context.io;
		101	defer connection.stream.close(io);
94		102
95	var recv_buffer: [4000]u8 = undefined;	103	var recv_buffer: [4000]u8 = undefined;
96	var send_buffer: [4000]u8 = undefined;	104	var send_buffer: [4000]u8 = undefined;
...	@@ -124,6 +132,7 @@ fn accept(context: *Context, connection: std.net.Server.Connection) void {	...	@@ -124,6 +132,7 @@ fn accept(context: *Context, connection: std.net.Server.Connection) void {
124		132
125	const Context = struct {	133	const Context = struct {
126	gpa: Allocator,	134	gpa: Allocator,
		135	io: Io,
127	lib_dir: std.fs.Dir,	136	lib_dir: std.fs.Dir,
128	zig_lib_directory: []const u8,	137	zig_lib_directory: []const u8,
129	zig_exe_path: []const u8,	138	zig_exe_path: []const u8,
...	@@ -185,6 +194,7 @@ fn serveDocsFile(	...	@@ -185,6 +194,7 @@ fn serveDocsFile(
185		194
186	fn serveSourcesTar(request: std.http.Server.Request, context: Context) !void {	195	fn serveSourcesTar(request: std.http.Server.Request, context: Context) !void {
187	const gpa = context.gpa;	196	const gpa = context.gpa;
		197	const io = context.io;
188		198
189	var send_buffer: [0x4000]u8 = undefined;	199	var send_buffer: [0x4000]u8 = undefined;
190	var response = try request.respondStreaming(&send_buffer, .{	200	var response = try request.respondStreaming(&send_buffer, .{
...	@@ -197,7 +207,7 @@ fn serveSourcesTar(request: std.http.Server.Request, context: Context) !void {	...	@@ -197,7 +207,7 @@ fn serveSourcesTar(request: std.http.Server.Request, context: Context) !void {
197	});	207	});
198		208
199	var std_dir = try context.lib_dir.openDir("std", .{ .iterate = true });	209	var std_dir = try context.lib_dir.openDir("std", .{ .iterate = true });
200	defer std_dir.close();	210	defer std_dir.close(io);
201		211
202	var walker = try std_dir.walk(gpa);	212	var walker = try std_dir.walk(gpa);
203	defer walker.deinit();	213	defer walker.deinit();
...	@@ -216,11 +226,11 @@ fn serveSourcesTar(request: std.http.Server.Request, context: Context) !void {	...	@@ -216,11 +226,11 @@ fn serveSourcesTar(request: std.http.Server.Request, context: Context) !void {
216	else => continue,	226	else => continue,
217	}	227	}
218	var file = try entry.dir.openFile(entry.basename, .{});	228	var file = try entry.dir.openFile(entry.basename, .{});
219	defer file.close();	229	defer file.close(io);
220	const stat = try file.stat();	230	const stat = try file.stat();
221	var file_reader: std.fs.File.Reader = .{	231	var file_reader: std.Io.File.Reader = .{
222	.file = file,	232	.file = file,
223	.interface = std.fs.File.Reader.initInterface(&.{}),	233	.interface = std.Io.File.Reader.initInterface(&.{}),
224	.size = stat.size,	234	.size = stat.size,
225	};	235	};
226	try archiver.writeFile(entry.path, &file_reader, stat.mtime);	236	try archiver.writeFile(entry.path, &file_reader, stat.mtime);
...	@@ -283,6 +293,7 @@ fn buildWasmBinary(	...	@@ -283,6 +293,7 @@ fn buildWasmBinary(
283	optimize_mode: std.builtin.OptimizeMode,	293	optimize_mode: std.builtin.OptimizeMode,
284	) !Cache.Path {	294	) !Cache.Path {
285	const gpa = context.gpa;	295	const gpa = context.gpa;
		296	const io = context.io;
286		297
287	var argv: std.ArrayList([]const u8) = .empty;	298	var argv: std.ArrayList([]const u8) = .empty;
288		299
...	@@ -371,7 +382,7 @@ fn buildWasmBinary(	...	@@ -371,7 +382,7 @@ fn buildWasmBinary(
371	}	382	}
372		383
373	// Send EOF to stdin.	384	// Send EOF to stdin.
374	child.stdin.?.close();	385	child.stdin.?.close(io);
375	child.stdin = null;	386	child.stdin = null;
376		387
377	switch (try child.wait()) {	388	switch (try child.wait()) {
...	@@ -410,7 +421,7 @@ fn buildWasmBinary(	...	@@ -410,7 +421,7 @@ fn buildWasmBinary(
410	};	421	};
411	}	422	}
412		423
413	fn sendMessage(file: std.fs.File, tag: std.zig.Client.Message.Tag) !void {	424	fn sendMessage(file: std.Io.File, tag: std.zig.Client.Message.Tag) !void {
414	const header: std.zig.Client.Message.Header = .{	425	const header: std.zig.Client.Message.Header = .{
415	.tag = tag,	426	.tag = tag,
416	.bytes_len = 0,	427	.bytes_len = 0,

lib/compiler/translate-c/main.zig+3-2

lib/std/Build/Cache/Directory.zig+2-2

...	@@ -52,8 +52,8 @@ pub fn joinZ(self: Directory, allocator: Allocator, paths: []const []const u8) !	...	@@ -52,8 +52,8 @@ pub fn joinZ(self: Directory, allocator: Allocator, paths: []const []const u8) !
52	/// Whether or not the handle should be closed, or the path should be freed	52	/// Whether or not the handle should be closed, or the path should be freed
53	/// is determined by usage, however this function is provided for convenience	53	/// is determined by usage, however this function is provided for convenience
54	/// if it happens to be what the caller needs.	54	/// if it happens to be what the caller needs.
55	pub fn closeAndFree(self: *Directory, gpa: Allocator) void {	55	pub fn closeAndFree(self: *Directory, gpa: Allocator, io: Io) void {
56	self.handle.close();	56	self.handle.close(io);
57	if (self.path) \|p\| gpa.free(p);	57	if (self.path) \|p\| gpa.free(p);
58	self.* = undefined;	58	self.* = undefined;
59	}	59	}

lib/std/Build/Fuzz.zig+2-2

...	@@ -411,7 +411,7 @@ fn prepareTables(fuzz: Fuzz, run_step: Step.Run, coverage_id: u64) error{ OutO	...	@@ -411,7 +411,7 @@ fn prepareTables(fuzz: Fuzz, run_step: Step.Run, coverage_id: u64) error{ OutO
411	});	411	});
412	return error.AlreadyReported;	412	return error.AlreadyReported;
413	};	413	};
414	defer coverage_file.close();	414	defer coverage_file.close(io);
415		415
416	const file_size = coverage_file.getEndPos() catch \|err\| {	416	const file_size = coverage_file.getEndPos() catch \|err\| {
417	log.err("unable to check len of coverage file '{f}': {t}", .{ coverage_file_path, err });	417	log.err("unable to check len of coverage file '{f}': {t}", .{ coverage_file_path, err });
...	@@ -533,7 +533,7 @@ pub fn waitAndPrintReport(fuzz: *Fuzz) void {	...	@@ -533,7 +533,7 @@ pub fn waitAndPrintReport(fuzz: *Fuzz) void {
533	cov.run.step.name, coverage_file_path, err,	533	cov.run.step.name, coverage_file_path, err,
534	});	534	});
535	};	535	};
536	defer coverage_file.close();	536	defer coverage_file.close(io);
537		537
538	const fuzz_abi = std.Build.abi.fuzz;	538	const fuzz_abi = std.Build.abi.fuzz;
539	var rbuf: [0x1000]u8 = undefined;	539	var rbuf: [0x1000]u8 = undefined;

lib/std/Build/Step.zig+2-1

...	@@ -441,6 +441,7 @@ pub fn evalZigProcess(	...	@@ -441,6 +441,7 @@ pub fn evalZigProcess(
441	assert(argv.len != 0);	441	assert(argv.len != 0);
442	const b = s.owner;	442	const b = s.owner;
443	const arena = b.allocator;	443	const arena = b.allocator;
		444	const io = b.graph.io;
444		445
445	try handleChildProcUnsupported(s);	446	try handleChildProcUnsupported(s);
446	try handleVerbose(s.owner, null, argv);	447	try handleVerbose(s.owner, null, argv);
...	@@ -474,7 +475,7 @@ pub fn evalZigProcess(	...	@@ -474,7 +475,7 @@ pub fn evalZigProcess(
474		475
475	if (!watch) {	476	if (!watch) {
476	// Send EOF to stdin.	477	// Send EOF to stdin.
477	zp.child.stdin.?.close();	478	zp.child.stdin.?.close(io);
478	zp.child.stdin = null;	479	zp.child.stdin = null;
479		480
480	const term = zp.child.wait() catch \|err\| {	481	const term = zp.child.wait() catch \|err\| {

lib/std/Build/Step/InstallArtifact.zig+2-1

...	@@ -119,6 +119,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {	...	@@ -119,6 +119,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
119	_ = options;	119	_ = options;
120	const install_artifact: *InstallArtifact = @fieldParentPtr("step", step);	120	const install_artifact: *InstallArtifact = @fieldParentPtr("step", step);
121	const b = step.owner;	121	const b = step.owner;
		122	const io = b.graph.io;
122		123
123	var all_cached = true;	124	var all_cached = true;
124		125
...	@@ -168,7 +169,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {	...	@@ -168,7 +169,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
168	src_dir_path, @errorName(err),	169	src_dir_path, @errorName(err),
169	});	170	});
170	};	171	};
171	defer src_dir.close();	172	defer src_dir.close(io);
172		173
173	var it = try src_dir.walk(b.allocator);	174	var it = try src_dir.walk(b.allocator);
174	next_entry: while (try it.next()) \|entry\| {	175	next_entry: while (try it.next()) \|entry\| {

lib/std/Build/Step/InstallDir.zig+1-1

...	@@ -68,7 +68,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {	...	@@ -68,7 +68,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
68	var src_dir = src_dir_path.root_dir.handle.openDir(io, src_dir_path.subPathOrDot(), .{ .iterate = true }) catch \|err\| {	68	var src_dir = src_dir_path.root_dir.handle.openDir(io, src_dir_path.subPathOrDot(), .{ .iterate = true }) catch \|err\| {
69	return step.fail("unable to open source directory '{f}': {t}", .{ src_dir_path, err });	69	return step.fail("unable to open source directory '{f}': {t}", .{ src_dir_path, err });
70	};	70	};
71	defer src_dir.close();	71	defer src_dir.close(io);
72	var it = try src_dir.walk(arena);	72	var it = try src_dir.walk(arena);
73	var all_cached = true;	73	var all_cached = true;
74	next_entry: while (try it.next()) \|entry\| {	74	next_entry: while (try it.next()) \|entry\| {

lib/std/Build/Step/Run.zig+11-9

...	@@ -851,7 +851,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {	...	@@ -851,7 +851,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
851	.{ file_path, err },	851	.{ file_path, err },
852	);	852	);
853	};	853	};
854	defer file.close();	854	defer file.close(io);
855		855
856	var buf: [1024]u8 = undefined;	856	var buf: [1024]u8 = undefined;
857	var file_reader = file.reader(io, &buf);	857	var file_reader = file.reader(io, &buf);
...	@@ -1111,7 +1111,7 @@ pub fn rerunInFuzzMode(	...	@@ -1111,7 +1111,7 @@ pub fn rerunInFuzzMode(
1111	result.writer.writeAll(file_plp.prefix) catch return error.OutOfMemory;	1111	result.writer.writeAll(file_plp.prefix) catch return error.OutOfMemory;
1112		1112
1113	const file = try file_path.root_dir.handle.openFile(file_path.subPathOrDot(), .{});	1113	const file = try file_path.root_dir.handle.openFile(file_path.subPathOrDot(), .{});
1114	defer file.close();	1114	defer file.close(io);
1115		1115
1116	var buf: [1024]u8 = undefined;	1116	var buf: [1024]u8 = undefined;
1117	var file_reader = file.reader(io, &buf);	1117	var file_reader = file.reader(io, &buf);
...	@@ -1671,8 +1671,10 @@ fn evalZigTest(	...	@@ -1671,8 +1671,10 @@ fn evalZigTest(
1671	options: Step.MakeOptions,	1671	options: Step.MakeOptions,
1672	fuzz_context: ?FuzzContext,	1672	fuzz_context: ?FuzzContext,
1673	) !EvalZigTestResult {	1673	) !EvalZigTestResult {
1674	const gpa = run.step.owner.allocator;	1674	const step_owner = run.step.owner;
1675	const arena = run.step.owner.allocator;	1675	const gpa = step_owner.allocator;
		1676	const arena = step_owner.allocator;
		1677	const io = step_owner.graph.io;
1676		1678
1677	// We will update this every time a child runs.	1679	// We will update this every time a child runs.
1678	run.step.result_peak_rss = 0;	1680	run.step.result_peak_rss = 0;
...	@@ -1724,7 +1726,7 @@ fn evalZigTest(	...	@@ -1724,7 +1726,7 @@ fn evalZigTest(
1724	run.step.result_stderr = try arena.dupe(u8, poller.reader(.stderr).buffered());	1726	run.step.result_stderr = try arena.dupe(u8, poller.reader(.stderr).buffered());
1725		1727
1726	// Clean up everything and wait for the child to exit.	1728	// Clean up everything and wait for the child to exit.
1727	child.stdin.?.close();	1729	child.stdin.?.close(io);
1728	child.stdin = null;	1730	child.stdin = null;
1729	poller.deinit();	1731	poller.deinit();
1730	child_killed = true;	1732	child_killed = true;
...	@@ -1744,7 +1746,7 @@ fn evalZigTest(	...	@@ -1744,7 +1746,7 @@ fn evalZigTest(
1744	poller.reader(.stderr).tossBuffered();	1746	poller.reader(.stderr).tossBuffered();
1745		1747
1746	// Clean up everything and wait for the child to exit.	1748	// Clean up everything and wait for the child to exit.
1747	child.stdin.?.close();	1749	child.stdin.?.close(io);
1748	child.stdin = null;	1750	child.stdin = null;
1749	poller.deinit();	1751	poller.deinit();
1750	child_killed = true;	1752	child_killed = true;
...	@@ -2177,7 +2179,7 @@ fn evalGeneric(run: Run, child: std.process.Child) !EvalGenericResult {	...	@@ -2177,7 +2179,7 @@ fn evalGeneric(run: Run, child: std.process.Child) !EvalGenericResult {
2177	child.stdin.?.writeAll(bytes) catch \|err\| {	2179	child.stdin.?.writeAll(bytes) catch \|err\| {
2178	return run.step.fail("unable to write stdin: {s}", .{@errorName(err)});	2180	return run.step.fail("unable to write stdin: {s}", .{@errorName(err)});
2179	};	2181	};
2180	child.stdin.?.close();	2182	child.stdin.?.close(io);
2181	child.stdin = null;	2183	child.stdin = null;
2182	},	2184	},
2183	.lazy_path => \|lazy_path\| {	2185	.lazy_path => \|lazy_path\| {
...	@@ -2185,7 +2187,7 @@ fn evalGeneric(run: Run, child: std.process.Child) !EvalGenericResult {	...	@@ -2185,7 +2187,7 @@ fn evalGeneric(run: Run, child: std.process.Child) !EvalGenericResult {
2185	const file = path.root_dir.handle.openFile(path.subPathOrDot(), .{}) catch \|err\| {	2187	const file = path.root_dir.handle.openFile(path.subPathOrDot(), .{}) catch \|err\| {
2186	return run.step.fail("unable to open stdin file: {s}", .{@errorName(err)});	2188	return run.step.fail("unable to open stdin file: {s}", .{@errorName(err)});
2187	};	2189	};
2188	defer file.close();	2190	defer file.close(io);
2189	// TODO https://github.com/ziglang/zig/issues/23955	2191	// TODO https://github.com/ziglang/zig/issues/23955
2190	var read_buffer: [1024]u8 = undefined;	2192	var read_buffer: [1024]u8 = undefined;
2191	var file_reader = file.reader(io, &read_buffer);	2193	var file_reader = file.reader(io, &read_buffer);
...	@@ -2204,7 +2206,7 @@ fn evalGeneric(run: Run, child: std.process.Child) !EvalGenericResult {	...	@@ -2204,7 +2206,7 @@ fn evalGeneric(run: Run, child: std.process.Child) !EvalGenericResult {
2204	stdin_writer.err.?,	2206	stdin_writer.err.?,
2205	}),	2207	}),
2206	};	2208	};
2207	child.stdin.?.close();	2209	child.stdin.?.close(io);
2208	child.stdin = null;	2210	child.stdin = null;
2209	},	2211	},
2210	.none => {},	2212	.none => {},

lib/std/Build/Step/WriteFile.zig+6-4

lib/std/Build/Watch/FsEvents.zig+5-4

 @@ -78,10 +78,10 @@ const ResolvedSymbols = struct {
     kCFAllocatorUseContext: *const CFAllocatorRef,
 };
-pub fn init() error{ OpenFrameworkFailed, MissingCoreServicesSymbol }!FsEvents {
+pub fn init(io: Io) error{ OpenFrameworkFailed, MissingCoreServicesSymbol }!FsEvents {
     var core_services = std.DynLib.open("/System/Library/Frameworks/CoreServices.framework/CoreServices") catch
         return error.OpenFrameworkFailed;
-    errdefer core_services.close();
+    errdefer core_services.close(io);
     var resolved_symbols: ResolvedSymbols = undefined;
     inline for (@typeInfo(ResolvedSymbols).@"struct".fields) |f| {
 @@ -102,10 +102,10 @@ pub fn init() error{ OpenFrameworkFailed, MissingCoreServicesSymbol }!FsEvents {
     };
 }
-pub fn deinit(fse: *FsEvents, gpa: Allocator) void {
+pub fn deinit(fse: *FsEvents, gpa: Allocator, io: Io) void {
     dispatch_release(fse.waiting_semaphore);
     dispatch_release(fse.dispatch_queue);
-    fse.core_services.close();
+    fse.core_services.close(io);
     gpa.free(fse.watch_roots);
     fse.watch_paths.deinit(gpa);
 @@ -487,6 +487,7 @@ const FSEventStreamEventFlags = packed struct(u32) {
 };
 const std = @import("std");
+const Io = std.Io;
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
 const watch_log = std.log.scoped(.watch);

lib/std/Build/WebServer.zig+4-3

...	@@ -129,6 +129,7 @@ pub fn init(opts: Options) WebServer {	...	@@ -129,6 +129,7 @@ pub fn init(opts: Options) WebServer {
129	}	129	}
130	pub fn deinit(ws: *WebServer) void {	130	pub fn deinit(ws: *WebServer) void {
131	const gpa = ws.gpa;	131	const gpa = ws.gpa;
		132	const io = ws.graph.io;
132		133
133	gpa.free(ws.step_names_trailing);	134	gpa.free(ws.step_names_trailing);
134	gpa.free(ws.step_status_bits);	135	gpa.free(ws.step_status_bits);
...	@@ -139,7 +140,7 @@ pub fn deinit(ws: *WebServer) void {	...	@@ -139,7 +140,7 @@ pub fn deinit(ws: *WebServer) void {
139	gpa.free(ws.time_report_update_times);	140	gpa.free(ws.time_report_update_times);
140		141
141	if (ws.serve_thread) \|t\| {	142	if (ws.serve_thread) \|t\| {
142	if (ws.tcp_server) \|*s\| s.stream.close();	143	if (ws.tcp_server) \|*s\| s.stream.close(io);
143	t.join();	144	t.join();
144	}	145	}
145	if (ws.tcp_server) \|*s\| s.deinit();	146	if (ws.tcp_server) \|*s\| s.deinit();
...	@@ -507,7 +508,7 @@ pub fn serveTarFile(ws: WebServer, request: http.Server.Request, paths: []cons	...	@@ -507,7 +508,7 @@ pub fn serveTarFile(ws: WebServer, request: http.Server.Request, paths: []cons
507	log.err("failed to open '{f}': {s}", .{ path, @errorName(err) });	508	log.err("failed to open '{f}': {s}", .{ path, @errorName(err) });
508	continue;	509	continue;
509	};	510	};
510	defer file.close();	511	defer file.close(io);
511	const stat = try file.stat();	512	const stat = try file.stat();
512	var read_buffer: [1024]u8 = undefined;	513	var read_buffer: [1024]u8 = undefined;
513	var file_reader: Io.File.Reader = .initSize(file.adaptToNewApi(), io, &read_buffer, stat.size);	514	var file_reader: Io.File.Reader = .initSize(file.adaptToNewApi(), io, &read_buffer, stat.size);
...	@@ -634,7 +635,7 @@ fn buildClientWasm(ws: *WebServer, arena: Allocator, optimize: std.builtin.Optim	...	@@ -634,7 +635,7 @@ fn buildClientWasm(ws: *WebServer, arena: Allocator, optimize: std.builtin.Optim
634	}	635	}
635		636
636	// Send EOF to stdin.	637	// Send EOF to stdin.
637	child.stdin.?.close();	638	child.stdin.?.close(io);
638	child.stdin = null;	639	child.stdin = null;
639		640
640	switch (try child.wait()) {	641	switch (try child.wait()) {

lib/std/Io/Dir.zig+25-16

...	@@ -131,7 +131,7 @@ pub const SelectiveWalker = struct {	...	@@ -131,7 +131,7 @@ pub const SelectiveWalker = struct {
131	/// After each call to this function, and on deinit(), the memory returned	131	/// After each call to this function, and on deinit(), the memory returned
132	/// from this function becomes invalid. A copy must be made in order to keep	132	/// from this function becomes invalid. A copy must be made in order to keep
133	/// a reference to the path.	133	/// a reference to the path.
134	pub fn next(self: *SelectiveWalker) Error!?Walker.Entry {	134	pub fn next(self: *SelectiveWalker, io: Io) Error!?Walker.Entry {
135	while (self.stack.items.len > 0) {	135	while (self.stack.items.len > 0) {
136	const top = &self.stack.items[self.stack.items.len - 1];	136	const top = &self.stack.items[self.stack.items.len - 1];
137	var dirname_len = top.dirname_len;	137	var dirname_len = top.dirname_len;
...	@@ -142,7 +142,7 @@ pub const SelectiveWalker = struct {	...	@@ -142,7 +142,7 @@ pub const SelectiveWalker = struct {
142	// likely just fail with the same error.	142	// likely just fail with the same error.
143	var item = self.stack.pop().?;	143	var item = self.stack.pop().?;
144	if (self.stack.items.len != 0) {	144	if (self.stack.items.len != 0) {
145	item.iter.dir.close();	145	item.iter.dir.close(io);
146	}	146	}
147	return err;	147	return err;
148	}) \|entry\| {	148	}) \|entry\| {
...	@@ -164,7 +164,7 @@ pub const SelectiveWalker = struct {	...	@@ -164,7 +164,7 @@ pub const SelectiveWalker = struct {
164	} else {	164	} else {
165	var item = self.stack.pop().?;	165	var item = self.stack.pop().?;
166	if (self.stack.items.len != 0) {	166	if (self.stack.items.len != 0) {
167	item.iter.dir.close();	167	item.iter.dir.close(io);
168	}	168	}
169	}	169	}
170	}	170	}
...	@@ -172,7 +172,7 @@ pub const SelectiveWalker = struct {	...	@@ -172,7 +172,7 @@ pub const SelectiveWalker = struct {
172	}	172	}
173		173
174	/// Traverses into the directory, continuing walking one level down.	174	/// Traverses into the directory, continuing walking one level down.
175	pub fn enter(self: *SelectiveWalker, entry: Walker.Entry) !void {	175	pub fn enter(self: *SelectiveWalker, io: Io, entry: Walker.Entry) !void {
176	if (entry.kind != .directory) {	176	if (entry.kind != .directory) {
177	@branchHint(.cold);	177	@branchHint(.cold);
178	return;	178	return;
...	@@ -184,7 +184,7 @@ pub const SelectiveWalker = struct {	...	@@ -184,7 +184,7 @@ pub const SelectiveWalker = struct {
184	else => \|e\| return e,	184	else => \|e\| return e,
185	}	185	}
186	};	186	};
187	errdefer new_dir.close();	187	errdefer new_dir.close(io);
188		188
189	try self.stack.append(self.allocator, .{	189	try self.stack.append(self.allocator, .{
190	.iter = new_dir.iterateAssumeFirstIteration(),	190	.iter = new_dir.iterateAssumeFirstIteration(),
...	@@ -200,11 +200,11 @@ pub const SelectiveWalker = struct {	...	@@ -200,11 +200,11 @@ pub const SelectiveWalker = struct {
200	/// Leaves the current directory, continuing walking one level up.	200	/// Leaves the current directory, continuing walking one level up.
201	/// If the current entry is a directory entry, then the "current directory"	201	/// If the current entry is a directory entry, then the "current directory"
202	/// will pertain to that entry if `enter` is called before `leave`.	202	/// will pertain to that entry if `enter` is called before `leave`.
203	pub fn leave(self: *SelectiveWalker) void {	203	pub fn leave(self: *SelectiveWalker, io: Io) void {
204	var item = self.stack.pop().?;	204	var item = self.stack.pop().?;
205	if (self.stack.items.len != 0) {	205	if (self.stack.items.len != 0) {
206	@branchHint(.likely);	206	@branchHint(.likely);
207	item.iter.dir.close();	207	item.iter.dir.close(io);
208	}	208	}
209	}	209	}
210	};	210	};
...	@@ -558,7 +558,8 @@ pub fn makeDir(dir: Dir, io: Io, sub_path: []const u8, permissions: Permissions)	...	@@ -558,7 +558,8 @@ pub fn makeDir(dir: Dir, io: Io, sub_path: []const u8, permissions: Permissions)
558		558
559	pub const MakePathError = MakeError \|\| StatPathError;	559	pub const MakePathError = MakeError \|\| StatPathError;
560		560
561	/// Creates parent directories as necessary to ensure `sub_path` exists as a directory.	561	/// Creates parent directories with default permissions as necessary to ensure
		562	/// `sub_path` exists as a directory.
562	///	563	///
563	/// Returns success if the path already exists and is a directory.	564	/// Returns success if the path already exists and is a directory.
564	///	565	///
...	@@ -579,8 +580,11 @@ pub const MakePathError = MakeError \|\| StatPathError;	...	@@ -579,8 +580,11 @@ pub const MakePathError = MakeError \|\| StatPathError;
579	/// - On other platforms, `..` are not resolved before the path is passed to `mkdirat`,	580	/// - On other platforms, `..` are not resolved before the path is passed to `mkdirat`,
580	/// meaning a `sub_path` like "first/../second" will create both a `./first`	581	/// meaning a `sub_path` like "first/../second" will create both a `./first`
581	/// and a `./second` directory.	582	/// and a `./second` directory.
582	pub fn makePath(dir: Dir, io: Io, sub_path: []const u8, permissions: Permissions) MakePathError!void {	583	///
583	_ = try io.vtable.dirMakePath(io.userdata, dir, sub_path, permissions);	584	/// See also:
		585	/// * `makePathStatus`
		586	pub fn makePath(dir: Dir, io: Io, sub_path: []const u8) MakePathError!void {
		587	_ = try io.vtable.dirMakePath(io.userdata, dir, sub_path, .default_dir);
584	}	588	}
585		589
586	pub const MakePathStatus = enum { existed, created };	590	pub const MakePathStatus = enum { existed, created };
...	@@ -593,6 +597,11 @@ pub fn makePathStatus(dir: Dir, io: Io, sub_path: []const u8, permissions: Permi	...	@@ -593,6 +597,11 @@ pub fn makePathStatus(dir: Dir, io: Io, sub_path: []const u8, permissions: Permi
593		597
594	pub const MakeOpenPathError = MakeError \|\| OpenError \|\| StatPathError;	598	pub const MakeOpenPathError = MakeError \|\| OpenError \|\| StatPathError;
595		599
		600	pub const MakeOpenPathOptions = struct {
		601	open_options: OpenOptions = .{},
		602	permissions: Permissions = .default_dir,
		603	};
		604
596	/// Performs the equivalent of `makePath` followed by `openDir`, atomically if possible.	605	/// Performs the equivalent of `makePath` followed by `openDir`, atomically if possible.
597	///	606	///
598	/// When this operation is canceled, it may leave the file system in a	607	/// When this operation is canceled, it may leave the file system in a
...	@@ -601,8 +610,8 @@ pub const MakeOpenPathError = MakeError \|\| OpenError \|\| StatPathError;	...	@@ -601,8 +610,8 @@ pub const MakeOpenPathError = MakeError \|\| OpenError \|\| StatPathError;
601	/// On Windows, `sub_path` should be encoded as [WTF-8](https://wtf-8.codeberg.page/).	610	/// On Windows, `sub_path` should be encoded as [WTF-8](https://wtf-8.codeberg.page/).
602	/// On WASI, `sub_path` should be encoded as valid UTF-8.	611	/// On WASI, `sub_path` should be encoded as valid UTF-8.
603	/// On other platforms, `sub_path` is an opaque sequence of bytes with no particular encoding.	612	/// On other platforms, `sub_path` is an opaque sequence of bytes with no particular encoding.
604	pub fn makeOpenPath(dir: Dir, io: Io, sub_path: []const u8, permissions: Permissions, options: OpenOptions) MakeOpenPathError!Dir {	613	pub fn makeOpenPath(dir: Dir, io: Io, sub_path: []const u8, options: MakeOpenPathOptions) MakeOpenPathError!Dir {
605	return io.vtable.dirMakeOpenPath(io.userdata, dir, sub_path, permissions, options);	614	return io.vtable.dirMakeOpenPath(io.userdata, dir, sub_path, options.permissions, options.open_options);
606	}	615	}
607		616
608	pub const Stat = File.Stat;	617	pub const Stat = File.Stat;
...	@@ -1266,10 +1275,10 @@ fn deleteTreeMinStackSizeWithKindHint(parent: Dir, io: Io, sub_path: []const u8,	...	@@ -1266,10 +1275,10 @@ fn deleteTreeMinStackSizeWithKindHint(parent: Dir, io: Io, sub_path: []const u8,
1266	start_over: while (true) {	1275	start_over: while (true) {
1267	var dir = (try parent.deleteTreeOpenInitialSubpath(io, sub_path, kind_hint)) orelse return;	1276	var dir = (try parent.deleteTreeOpenInitialSubpath(io, sub_path, kind_hint)) orelse return;
1268	var cleanup_dir_parent: ?Dir = null;	1277	var cleanup_dir_parent: ?Dir = null;
1269	defer if (cleanup_dir_parent) \|*d\| d.close();	1278	defer if (cleanup_dir_parent) \|*d\| d.close(io);
1270		1279
1271	var cleanup_dir = true;	1280	var cleanup_dir = true;
1272	defer if (cleanup_dir) dir.close();	1281	defer if (cleanup_dir) dir.close(io);
1273		1282
1274	// Valid use of max_path_bytes because dir_name_buf will only	1283	// Valid use of max_path_bytes because dir_name_buf will only
1275	// ever store a single path component that was returned from the	1284	// ever store a single path component that was returned from the
...	@@ -1315,7 +1324,7 @@ fn deleteTreeMinStackSizeWithKindHint(parent: Dir, io: Io, sub_path: []const u8,	...	@@ -1315,7 +1324,7 @@ fn deleteTreeMinStackSizeWithKindHint(parent: Dir, io: Io, sub_path: []const u8,
1315	error.Canceled,	1324	error.Canceled,
1316	=> \|e\| return e,	1325	=> \|e\| return e,
1317	};	1326	};
1318	if (cleanup_dir_parent) \|*d\| d.close();	1327	if (cleanup_dir_parent) \|*d\| d.close(io);
1319	cleanup_dir_parent = dir;	1328	cleanup_dir_parent = dir;
1320	dir = new_dir;	1329	dir = new_dir;
1321	const result = dir_name_buf[0..entry.name.len];	1330	const result = dir_name_buf[0..entry.name.len];
...	@@ -1354,7 +1363,7 @@ fn deleteTreeMinStackSizeWithKindHint(parent: Dir, io: Io, sub_path: []const u8,	...	@@ -1354,7 +1363,7 @@ fn deleteTreeMinStackSizeWithKindHint(parent: Dir, io: Io, sub_path: []const u8,
1354	}	1363	}
1355	// Reached the end of the directory entries, which means we successfully deleted all of them.	1364	// Reached the end of the directory entries, which means we successfully deleted all of them.
1356	// Now to remove the directory itself.	1365	// Now to remove the directory itself.
1357	dir.close();	1366	dir.close(io);
1358	cleanup_dir = false;	1367	cleanup_dir = false;
1359		1368
1360	if (cleanup_dir_parent) \|d\| {	1369	if (cleanup_dir_parent) \|d\| {

lib/std/Io/Writer.zig+3-3

lib/std/Io/net/test.zig+7-3

 @@ -232,8 +232,10 @@ test "listen on an in use port" {
 fn testClientToHost(allocator: mem.Allocator, name: []const u8, port: u16) anyerror!void {
     if (builtin.os.tag == .wasi) return error.SkipZigTest;
+    const io = testing.io;
     const connection = try net.tcpConnectToHost(allocator, name, port);
-    defer connection.close();
+    defer connection.close(io);
     var buf: [100]u8 = undefined;
     const len = try connection.read(&buf);
 @@ -244,8 +246,10 @@ fn testClientToHost(allocator: mem.Allocator, name: []const u8, port: u16) anyer
 fn testClient(addr: net.IpAddress) anyerror!void {
     if (builtin.os.tag == .wasi) return error.SkipZigTest;
+    const io = testing.io;
     const socket_file = try net.tcpConnectToAddress(addr);
-    defer socket_file.close();
+    defer socket_file.close(io);
     var buf: [100]u8 = undefined;
     const len = try socket_file.read(&buf);
 @@ -330,7 +334,7 @@ test "non-blocking tcp server" {
     try testing.expectError(error.WouldBlock, accept_err);
     const socket_file = try net.tcpConnectToAddress(server.socket.address);
-    defer socket_file.close();
+    defer socket_file.close(io);
     var stream = try server.accept(io);
     defer stream.close(io);

lib/std/Io/test.zig+11-5

 @@ -28,7 +28,7 @@ test "write a file, read it, then delete it" {
     const tmp_file_name = "temp_test_file.txt";
     {
         var file = try tmp.dir.createFile(tmp_file_name, .{});
-        defer file.close();
+        defer file.close(io);
         var file_writer = file.writer(&.{});
         const st = &file_writer.interface;
 @@ -45,7 +45,7 @@ test "write a file, read it, then delete it" {
     {
         var file = try tmp.dir.openFile(tmp_file_name, .{});
-        defer file.close();
+        defer file.close(io);
         const file_size = try file.getEndPos();
         const expected_file_size: u64 = "begin".len + data.len + "end".len;
 @@ -67,9 +67,11 @@ test "File seek ops" {
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
+    const io = testing.io;
     const tmp_file_name = "temp_test_file.txt";
     var file = try tmp.dir.createFile(tmp_file_name, .{});
-    defer file.close();
+    defer file.close(io);
     try file.writeAll(&([_]u8{0x55} ** 8192));
 @@ -88,12 +90,14 @@ test "File seek ops" {
 }
 test "setEndPos" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     const tmp_file_name = "temp_test_file.txt";
     var file = try tmp.dir.createFile(tmp_file_name, .{});
-    defer file.close();
+    defer file.close(io);
     // Verify that the file size changes and the file offset is not moved
     try expect((try file.getEndPos()) == 0);
 @@ -111,12 +115,14 @@ test "setEndPos" {
 }
 test "updateTimes" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     const tmp_file_name = "just_a_temporary_file.txt";
     var file = try tmp.dir.createFile(tmp_file_name, .{ .read = true });
-    defer file.close();
+    defer file.close(io);
     const stat_old = try file.stat();
     // Set atime and mtime to 5s before

lib/std/Thread.zig+4-3

lib/std/crypto/Certificate/Bundle.zig+3-3

lib/std/crypto/codecs/asn1/test.zig+1-1

...	@@ -75,6 +75,6 @@ test AllTypes {	...	@@ -75,6 +75,6 @@ test AllTypes {
75	// Use this to update test file.	75	// Use this to update test file.
76	// const dir = try std.fs.cwd().openDir("lib/std/crypto/asn1", .{});	76	// const dir = try std.fs.cwd().openDir("lib/std/crypto/asn1", .{});
77	// var file = try dir.createFile(path, .{});	77	// var file = try dir.createFile(path, .{});
78	// defer file.close();	78	// defer file.close(io);
79	// try file.writeAll(buf);	79	// try file.writeAll(buf);
80	}	80	}

lib/std/debug.zig+4-4

lib/std/debug/ElfFile.zig+17-9

 @@ -1,5 +1,13 @@
 //! A helper type for loading an ELF file and collecting its DWARF debug information, unwind
 //! information, and symbol table.
+const ElfFile = @This();
+const std = @import("std");
+const Io = std.Io;
+const Endian = std.builtin.Endian;
+const Dwarf = std.debug.Dwarf;
+const Allocator = std.mem.Allocator;
+const elf = std.elf;
 is_64: bool,
 endian: Endian,
 @@ -358,10 +366,17 @@ const Section = struct {
     const Array = std.enums.EnumArray(Section.Id, ?Section);
 };
-fn loadSeparateDebugFile(arena: Allocator, main_loaded: *LoadInnerResult, opt_crc: ?u32, comptime fmt: []const u8, args: anytype) Allocator.Error!?[]align(std.heap.page_size_min) const u8 {
+fn loadSeparateDebugFile(
+    arena: Allocator,
+    io: Io,
+    main_loaded: *LoadInnerResult,
+    opt_crc: ?u32,
+    comptime fmt: []const u8,
+    args: anytype,
+) Allocator.Error!?[]align(std.heap.page_size_min) const u8 {
     const path = try std.fmt.allocPrint(arena, fmt, args);
     const elf_file = std.fs.cwd().openFile(path, .{}) catch return null;
-    defer elf_file.close();
+    defer elf_file.close(io);
     const result = loadInner(arena, elf_file, opt_crc) catch |err| switch (err) {
         error.OutOfMemory => |e| return e,
 @@ -529,10 +544,3 @@ fn loadInner(
         .mapped_mem = mapped_mem,
     };
 }
-const std = @import("std");
-const Endian = std.builtin.Endian;
-const Dwarf = std.debug.Dwarf;
-const ElfFile = @This();
-const Allocator = std.mem.Allocator;
-const elf = std.elf;

lib/std/debug/Info.zig+15-6

 @@ -5,19 +5,18 @@
 //! Unlike `std.debug.SelfInfo`, this API does not assume the debug information
 //! in question happens to match the host CPU architecture, OS, or other target
 //! properties.
+const Info = @This();
 const std = @import("../std.zig");
+const Io = std.Io;
 const Allocator = std.mem.Allocator;
 const Path = std.Build.Cache.Path;
 const assert = std.debug.assert;
 const Coverage = std.debug.Coverage;
 const SourceLocation = std.debug.Coverage.SourceLocation;
 const ElfFile = std.debug.ElfFile;
 const MachOFile = std.debug.MachOFile;
-const Info = @This();
 impl: union(enum) {
     elf: ElfFile,
     macho: MachOFile,
 @@ -25,13 +24,23 @@ impl: union(enum) {
 /// Externally managed, outlives this `Info` instance.
 coverage: *Coverage,
-pub const LoadError = std.fs.File.OpenError || ElfFile.LoadError || MachOFile.Error || std.debug.Dwarf.ScanError || error{ MissingDebugInfo, UnsupportedDebugInfo };
+pub const LoadError = error{
+    MissingDebugInfo,
+    UnsupportedDebugInfo,
+} || std.fs.File.OpenError || ElfFile.LoadError || MachOFile.Error || std.debug.Dwarf.ScanError;
-pub fn load(gpa: Allocator, path: Path, coverage: *Coverage, format: std.Target.ObjectFormat, arch: std.Target.Cpu.Arch) LoadError!Info {
+pub fn load(
+    gpa: Allocator,
+    io: Io,
+    path: Path,
+    coverage: *Coverage,
+    format: std.Target.ObjectFormat,
+    arch: std.Target.Cpu.Arch,
+) LoadError!Info {
     switch (format) {
         .elf => {
             var file = try path.root_dir.handle.openFile(path.sub_path, .{});
-            defer file.close();
+            defer file.close(io);
             var elf_file: ElfFile = try .load(gpa, file, null, &.none);
             errdefer elf_file.deinit(gpa);

lib/std/debug/MachOFile.zig+9-9

lib/std/debug/SelfInfo/Elf.zig+5-5

lib/std/debug/SelfInfo/MachO.zig+2-2

...	@@ -615,12 +615,12 @@ test {	...	@@ -615,12 +615,12 @@ test {
615	}	615	}
616		616
617	/// Uses `mmap` to map the file at `path` into memory.	617	/// Uses `mmap` to map the file at `path` into memory.
618	fn mapDebugInfoFile(path: []const u8) ![]align(std.heap.page_size_min) const u8 {	618	fn mapDebugInfoFile(io: Io, path: []const u8) ![]align(std.heap.page_size_min) const u8 {
619	const file = std.fs.cwd().openFile(path, .{}) catch \|err\| switch (err) {	619	const file = std.fs.cwd().openFile(path, .{}) catch \|err\| switch (err) {
620	error.FileNotFound => return error.MissingDebugInfo,	620	error.FileNotFound => return error.MissingDebugInfo,
621	else => return error.ReadFailed,	621	else => return error.ReadFailed,
622	};	622	};
623	defer file.close();	623	defer file.close(io);
624		624
625	const file_end_pos = file.getEndPos() catch \|err\| switch (err) {	625	const file_end_pos = file.getEndPos() catch \|err\| switch (err) {
626	error.Unexpected => \|e\| return e,	626	error.Unexpected => \|e\| return e,

lib/std/debug/SelfInfo/Windows.zig+3-3

lib/std/dynamic_library.zig+18-16

 @@ -1,10 +1,12 @@
-const std = @import("std.zig");
 const builtin = @import("builtin");
+const native_os = builtin.os.tag;
+const std = @import("std.zig");
+const Io = std.Io;
 const mem = std.mem;
 const testing = std.testing;
 const elf = std.elf;
 const windows = std.os.windows;
-const native_os = builtin.os.tag;
 const posix = std.posix;
 /// Cross-platform dynamic library loading and symbol lookup.
 @@ -38,8 +40,8 @@ pub const DynLib = struct {
     }
     /// Trusts the file.
-    pub fn close(self: *DynLib) void {
+    pub fn close(self: *DynLib, io: Io) void {
-        return self.inner.close();
+        return self.inner.close(io);
     }
     pub fn lookup(self: *DynLib, comptime T: type, name: [:0]const u8) ?T {
 @@ -155,23 +157,23 @@ pub const ElfDynLib = struct {
         dt_gnu_hash: *elf.gnu_hash.Header,
     };
-    fn openPath(path: []const u8) !std.fs.Dir {
+    fn openPath(path: []const u8, io: Io) !std.fs.Dir {
         if (path.len == 0) return error.NotDir;
         var parts = std.mem.tokenizeScalar(u8, path, '/');
         var parent = if (path[0] == '/') try std.fs.cwd().openDir("/", .{}) else std.fs.cwd();
         while (parts.next()) |part| {
             const child = try parent.openDir(part, .{});
-            parent.close();
+            parent.close(io);
             parent = child;
         }
         return parent;
     }
-    fn resolveFromSearchPath(search_path: []const u8, file_name: []const u8, delim: u8) ?posix.fd_t {
+    fn resolveFromSearchPath(io: Io, search_path: []const u8, file_name: []const u8, delim: u8) ?posix.fd_t {
         var paths = std.mem.tokenizeScalar(u8, search_path, delim);
         while (paths.next()) |p| {
             var dir = openPath(p) catch continue;
-            defer dir.close();
+            defer dir.close(io);
             const fd = posix.openat(dir.fd, file_name, .{
                 .ACCMODE = .RDONLY,
                 .CLOEXEC = true,
 @@ -181,9 +183,9 @@ pub const ElfDynLib = struct {
         return null;
     }
-    fn resolveFromParent(dir_path: []const u8, file_name: []const u8) ?posix.fd_t {
+    fn resolveFromParent(io: Io, dir_path: []const u8, file_name: []const u8) ?posix.fd_t {
         var dir = std.fs.cwd().openDir(dir_path, .{}) catch return null;
-        defer dir.close();
+        defer dir.close(io);
         return posix.openat(dir.fd, file_name, .{
             .ACCMODE = .RDONLY,
             .CLOEXEC = true,
 @@ -195,7 +197,7 @@ pub const ElfDynLib = struct {
     // - DT_RPATH of the calling binary is not used as a search path
     // - DT_RUNPATH of the calling binary is not used as a search path
     // - /etc/ld.so.cache is not read
-    fn resolveFromName(path_or_name: []const u8) !posix.fd_t {
+    fn resolveFromName(io: Io, path_or_name: []const u8) !posix.fd_t {
         // If filename contains a slash ("/"), then it is interpreted as a (relative or absolute) pathname
         if (std.mem.findScalarPos(u8, path_or_name, 0, '/')) |_| {
             return posix.open(path_or_name, .{ .ACCMODE = .RDONLY, .CLOEXEC = true }, 0);
 @@ -206,21 +208,21 @@ pub const ElfDynLib = struct {
             std.os.linux.getegid() == std.os.linux.getgid())
         {
             if (posix.getenvZ("LD_LIBRARY_PATH")) |ld_library_path| {
-                if (resolveFromSearchPath(ld_library_path, path_or_name, ':')) |fd| {
+                if (resolveFromSearchPath(io, ld_library_path, path_or_name, ':')) |fd| {
                     return fd;
                 }
             }
         }
         // Lastly the directories /lib and /usr/lib are searched (in this exact order)
-        if (resolveFromParent("/lib", path_or_name)) |fd| return fd;
+        if (resolveFromParent(io, "/lib", path_or_name)) |fd| return fd;
-        if (resolveFromParent("/usr/lib", path_or_name)) |fd| return fd;
+        if (resolveFromParent(io, "/usr/lib", path_or_name)) |fd| return fd;
         return error.FileNotFound;
     }
     /// Trusts the file. Malicious file will be able to execute arbitrary code.
-    pub fn open(path: []const u8) Error!ElfDynLib {
+    pub fn open(io: Io, path: []const u8) Error!ElfDynLib {
-        const fd = try resolveFromName(path);
+        const fd = try resolveFromName(io, path);
         defer posix.close(fd);
         const file: std.fs.File = .{ .handle = fd };

lib/std/fs.zig+2-2

...	@@ -227,7 +227,7 @@ pub fn deleteFileAbsolute(absolute_path: []const u8) Dir.DeleteFileError!void {	...	@@ -227,7 +227,7 @@ pub fn deleteFileAbsolute(absolute_path: []const u8) Dir.DeleteFileError!void {
227	/// On Windows, `absolute_path` should be encoded as [WTF-8](https://wtf-8.codeberg.page/).	227	/// On Windows, `absolute_path` should be encoded as [WTF-8](https://wtf-8.codeberg.page/).
228	/// On WASI, `absolute_path` should be encoded as valid UTF-8.	228	/// On WASI, `absolute_path` should be encoded as valid UTF-8.
229	/// On other platforms, `absolute_path` is an opaque sequence of bytes with no particular encoding.	229	/// On other platforms, `absolute_path` is an opaque sequence of bytes with no particular encoding.
230	pub fn deleteTreeAbsolute(absolute_path: []const u8) !void {	230	pub fn deleteTreeAbsolute(io: Io, absolute_path: []const u8) !void {
231	assert(path.isAbsolute(absolute_path));	231	assert(path.isAbsolute(absolute_path));
232	const dirname = path.dirname(absolute_path) orelse return error{	232	const dirname = path.dirname(absolute_path) orelse return error{
233	/// Attempt to remove the root file system path.	233	/// Attempt to remove the root file system path.
...	@@ -236,7 +236,7 @@ pub fn deleteTreeAbsolute(absolute_path: []const u8) !void {	...	@@ -236,7 +236,7 @@ pub fn deleteTreeAbsolute(absolute_path: []const u8) !void {
236	}.CannotDeleteRootDirectory;	236	}.CannotDeleteRootDirectory;
237		237
238	var dir = try cwd().openDir(dirname, .{});	238	var dir = try cwd().openDir(dirname, .{});
239	defer dir.close();	239	defer dir.close(io);
240		240
241	return dir.deleteTree(path.basename(absolute_path));	241	return dir.deleteTree(path.basename(absolute_path));
242	}	242	}

lib/std/fs/test.zig+171-99

 @@ -178,6 +178,8 @@ fn setupSymlinkAbsolute(target: []const u8, link: []const u8, flags: SymLinkFlag
 }
 test "Dir.readLink" {
+    const io = testing.io;
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
             // Create some targets
 @@ -208,7 +210,7 @@ test "Dir.readLink" {
             const parent_file = ".." ++ fs.path.sep_str ++ "target.txt";
             const canonical_parent_file = try ctx.toCanonicalPathSep(parent_file);
             var subdir = try ctx.dir.makeOpenPath("subdir", .{});
-            defer subdir.close();
+            defer subdir.close(io);
             try setupSymlink(subdir, canonical_parent_file, "relative-link.txt", .{});
             try testReadLink(subdir, canonical_parent_file, "relative-link.txt");
             if (builtin.os.tag == .windows) {
 @@ -268,6 +270,8 @@ fn testReadLinkAbsolute(target_path: []const u8, symlink_path: []const u8) !void
 }
 test "File.stat on a File that is a symlink returns Kind.sym_link" {
+    const io = testing.io;
     // This test requires getting a file descriptor of a symlink which
     // is not possible on all targets
     switch (builtin.target.os.tag) {
 @@ -302,7 +306,7 @@ test "File.stat on a File that is a symlink returns Kind.sym_link" {
                         .SecurityDescriptor = null,
                         .SecurityQualityOfService = null,
                     };
-                    var io: windows.IO_STATUS_BLOCK = undefined;
+                    var io_status_block: windows.IO_STATUS_BLOCK = undefined;
                     const rc = windows.ntdll.NtCreateFile(
                         &handle,
                         .{
 @@ -317,7 +321,7 @@ test "File.stat on a File that is a symlink returns Kind.sym_link" {
                             },
                         },
                         &attr,
-                        &io,
+                        &io_status_block,
                         null,
                         .{ .NORMAL = true },
                         .VALID_FLAGS,
 @@ -352,7 +356,7 @@ test "File.stat on a File that is a symlink returns Kind.sym_link" {
                 },
                 else => unreachable,
             };
-            defer symlink.close();
+            defer symlink.close(io);
             const stat = try symlink.stat();
             try testing.expectEqual(File.Kind.sym_link, stat.kind);
 @@ -361,6 +365,8 @@ test "File.stat on a File that is a symlink returns Kind.sym_link" {
 }
 test "openDir" {
+    const io = testing.io;
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
             const allocator = ctx.arena.allocator();
 @@ -370,7 +376,7 @@ test "openDir" {
             for ([_][]const u8{ "", ".", ".." }) |sub_path| {
                 const dir_path = try fs.path.join(allocator, &.{ subdir_path, sub_path });
                 var dir = try ctx.dir.openDir(dir_path, .{});
-                defer dir.close();
+                defer dir.close(io);
             }
         }
     }.impl);
 @@ -393,6 +399,8 @@ test "openDirAbsolute" {
     if (native_os == .wasi) return error.SkipZigTest;
     if (native_os == .openbsd) return error.SkipZigTest;
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
 @@ -404,7 +412,7 @@ test "openDirAbsolute" {
     // Can open sub_path
     var tmp_sub = try fs.openDirAbsolute(sub_path, .{});
-    defer tmp_sub.close();
+    defer tmp_sub.close(io);
     const sub_ino = (try tmp_sub.stat()).inode;
 @@ -414,7 +422,7 @@ test "openDirAbsolute" {
         defer testing.allocator.free(dir_path);
         var dir = try fs.openDirAbsolute(dir_path, .{});
-        defer dir.close();
+        defer dir.close(io);
         const ino = (try dir.stat()).inode;
         try testing.expectEqual(tmp_ino, ino);
 @@ -426,7 +434,7 @@ test "openDirAbsolute" {
         defer testing.allocator.free(dir_path);
         var dir = try fs.openDirAbsolute(dir_path, .{});
-        defer dir.close();
+        defer dir.close(io);
         const ino = (try dir.stat()).inode;
         try testing.expectEqual(sub_ino, ino);
 @@ -438,7 +446,7 @@ test "openDirAbsolute" {
         defer testing.allocator.free(dir_path);
         var dir = try fs.openDirAbsolute(dir_path, .{});
-        defer dir.close();
+        defer dir.close(io);
         const ino = (try dir.stat()).inode;
         try testing.expectEqual(tmp_ino, ino);
 @@ -446,13 +454,15 @@ test "openDirAbsolute" {
 }
 test "openDir cwd parent '..'" {
+    const io = testing.io;
     var dir = fs.cwd().openDir("..", .{}) catch |err| {
         if (native_os == .wasi and err == error.PermissionDenied) {
             return; // This is okay. WASI disallows escaping from the fs sandbox
         }
         return err;
     };
-    defer dir.close();
+    defer dir.close(io);
 }
 test "openDir non-cwd parent '..'" {
 @@ -461,14 +471,16 @@ test "openDir non-cwd parent '..'" {
         else => {},
     }
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     var subdir = try tmp.dir.makeOpenPath("subdir", .{});
-    defer subdir.close();
+    defer subdir.close(io);
     var dir = try subdir.openDir("..", .{});
-    defer dir.close();
+    defer dir.close(io);
     const expected_path = try tmp.dir.realpathAlloc(testing.allocator, ".");
     defer testing.allocator.free(expected_path);
 @@ -516,12 +528,14 @@ test "readLinkAbsolute" {
 }
 test "Dir.Iterator" {
+    const io = testing.io;
     var tmp_dir = tmpDir(.{ .iterate = true });
     defer tmp_dir.cleanup();
     // First, create a couple of entries to iterate over.
     const file = try tmp_dir.dir.createFile("some_file", .{});
-    file.close();
+    file.close(io);
     try tmp_dir.dir.makeDir("some_dir");
 @@ -546,6 +560,8 @@ test "Dir.Iterator" {
 }
 test "Dir.Iterator many entries" {
+    const io = testing.io;
     var tmp_dir = tmpDir(.{ .iterate = true });
     defer tmp_dir.cleanup();
 @@ -555,7 +571,7 @@ test "Dir.Iterator many entries" {
     while (i < num) : (i += 1) {
         const name = try std.fmt.bufPrint(&buf, "{}", .{i});
         const file = try tmp_dir.dir.createFile(name, .{});
-        file.close();
+        file.close(io);
     }
     var arena = ArenaAllocator.init(testing.allocator);
 @@ -581,12 +597,14 @@ test "Dir.Iterator many entries" {
 }
 test "Dir.Iterator twice" {
+    const io = testing.io;
     var tmp_dir = tmpDir(.{ .iterate = true });
     defer tmp_dir.cleanup();
     // First, create a couple of entries to iterate over.
     const file = try tmp_dir.dir.createFile("some_file", .{});
-    file.close();
+    file.close(io);
     try tmp_dir.dir.makeDir("some_dir");
 @@ -614,12 +632,14 @@ test "Dir.Iterator twice" {
 }
 test "Dir.Iterator reset" {
+    const io = testing.io;
     var tmp_dir = tmpDir(.{ .iterate = true });
     defer tmp_dir.cleanup();
     // First, create a couple of entries to iterate over.
     const file = try tmp_dir.dir.createFile("some_file", .{});
-    file.close();
+    file.close(io);
     try tmp_dir.dir.makeDir("some_dir");
 @@ -650,12 +670,14 @@ test "Dir.Iterator reset" {
 }
 test "Dir.Iterator but dir is deleted during iteration" {
+    const io = testing.io;
     var tmp = std.testing.tmpDir(.{});
     defer tmp.cleanup();
     // Create directory and setup an iterator for it
     var subdir = try tmp.dir.makeOpenPath("subdir", .{ .iterate = true });
-    defer subdir.close();
+    defer subdir.close(io);
     var iterator = subdir.iterate();
 @@ -742,11 +764,13 @@ test "Dir.realpath smoke test" {
 }
 test "readFileAlloc" {
+    const io = testing.io;
     var tmp_dir = tmpDir(.{});
     defer tmp_dir.cleanup();
     var file = try tmp_dir.dir.createFile("test_file", .{ .read = true });
-    defer file.close();
+    defer file.close(io);
     const buf1 = try tmp_dir.dir.readFileAlloc("test_file", testing.allocator, .limited(1024));
     defer testing.allocator.free(buf1);
 @@ -815,10 +839,12 @@ test "statFile on dangling symlink" {
 test "directory operations on files" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             const test_file_name = try ctx.transformPath("test_file");
             var file = try ctx.dir.createFile(test_file_name, .{ .read = true });
-            file.close();
+            file.close(io);
             try testing.expectError(error.PathAlreadyExists, ctx.dir.makeDir(test_file_name));
             try testing.expectError(error.NotDir, ctx.dir.openDir(test_file_name, .{}));
 @@ -833,7 +859,7 @@ test "directory operations on files" {
             file = try ctx.dir.openFile(test_file_name, .{});
             const stat = try file.stat();
             try testing.expectEqual(File.Kind.file, stat.kind);
-            file.close();
+            file.close(io);
         }
     }.impl);
 }
 @@ -842,6 +868,8 @@ test "file operations on directories" {
     // TODO: fix this test on FreeBSD. https://github.com/ziglang/zig/issues/1759
     if (native_os == .freebsd) return error.SkipZigTest;
+    const io = testing.io;
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
             const test_dir_name = try ctx.transformPath("test_dir");
 @@ -869,7 +897,7 @@ test "file operations on directories" {
             if (native_os == .wasi and builtin.link_libc) {
                 // wasmtime unexpectedly succeeds here, see https://github.com/ziglang/zig/issues/20747
                 const handle = try ctx.dir.openFile(test_dir_name, .{ .mode = .read_write });
-                handle.close();
+                handle.close(io);
             } else {
                 // Note: The `.mode = .read_write` is necessary to ensure the error occurs on all platforms.
                 // TODO: Add a read-only test as well, see https://github.com/ziglang/zig/issues/5732
 @@ -883,21 +911,23 @@ test "file operations on directories" {
             // ensure the directory still exists as a sanity check
             var dir = try ctx.dir.openDir(test_dir_name, .{});
-            dir.close();
+            dir.close(io);
         }
     }.impl);
 }
 test "makeOpenPath parent dirs do not exist" {
+    const io = testing.io;
     var tmp_dir = tmpDir(.{});
     defer tmp_dir.cleanup();
     var dir = try tmp_dir.dir.makeOpenPath("root_dir/parent_dir/some_dir", .{});
-    dir.close();
+    dir.close(io);
     // double check that the full directory structure was created
     var dir_verification = try tmp_dir.dir.openDir("root_dir/parent_dir/some_dir", .{});
-    dir_verification.close();
+    dir_verification.close(io);
 }
 test "deleteDir" {
 @@ -924,6 +954,7 @@ test "deleteDir" {
 test "Dir.rename files" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             // Rename on Windows can hit intermittent AccessDenied errors
             // when certain conditions are true about the host system.
             // For now, skip this test when the path type is UNC to avoid them.
 @@ -939,13 +970,13 @@ test "Dir.rename files" {
             const test_file_name = try ctx.transformPath("test_file");
             const renamed_test_file_name = try ctx.transformPath("test_file_renamed");
             var file = try ctx.dir.createFile(test_file_name, .{ .read = true });
-            file.close();
+            file.close(io);
             try ctx.dir.rename(test_file_name, renamed_test_file_name);
             // Ensure the file was renamed
             try testing.expectError(error.FileNotFound, ctx.dir.openFile(test_file_name, .{}));
             file = try ctx.dir.openFile(renamed_test_file_name, .{});
-            file.close();
+            file.close(io);
             // Rename to self succeeds
             try ctx.dir.rename(renamed_test_file_name, renamed_test_file_name);
 @@ -953,12 +984,12 @@ test "Dir.rename files" {
             // Rename to existing file succeeds
             const existing_file_path = try ctx.transformPath("existing_file");
             var existing_file = try ctx.dir.createFile(existing_file_path, .{ .read = true });
-            existing_file.close();
+            existing_file.close(io);
             try ctx.dir.rename(renamed_test_file_name, existing_file_path);
             try testing.expectError(error.FileNotFound, ctx.dir.openFile(renamed_test_file_name, .{}));
             file = try ctx.dir.openFile(existing_file_path, .{});
-            file.close();
+            file.close(io);
         }
     }.impl);
 }
 @@ -966,6 +997,8 @@ test "Dir.rename files" {
 test "Dir.rename directories" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             // Rename on Windows can hit intermittent AccessDenied errors
             // when certain conditions are true about the host system.
             // For now, skip this test when the path type is UNC to avoid them.
 @@ -985,8 +1018,8 @@ test "Dir.rename directories" {
             // Put a file in the directory
             var file = try dir.createFile("test_file", .{ .read = true });
-            file.close();
+            file.close(io);
-            dir.close();
+            dir.close(io);
             const test_dir_renamed_again_path = try ctx.transformPath("test_dir_renamed_again");
             try ctx.dir.rename(test_dir_renamed_path, test_dir_renamed_again_path);
 @@ -995,8 +1028,8 @@ test "Dir.rename directories" {
             try testing.expectError(error.FileNotFound, ctx.dir.openDir(test_dir_renamed_path, .{}));
             dir = try ctx.dir.openDir(test_dir_renamed_again_path, .{});
             file = try dir.openFile("test_file", .{});
-            file.close();
+            file.close(io);
-            dir.close();
+            dir.close(io);
         }
     }.impl);
 }
 @@ -1007,6 +1040,8 @@ test "Dir.rename directory onto empty dir" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             const test_dir_path = try ctx.transformPath("test_dir");
             const target_dir_path = try ctx.transformPath("target_dir_path");
 @@ -1017,7 +1052,7 @@ test "Dir.rename directory onto empty dir" {
             // Ensure the directory was renamed
             try testing.expectError(error.FileNotFound, ctx.dir.openDir(test_dir_path, .{}));
             var dir = try ctx.dir.openDir(target_dir_path, .{});
-            dir.close();
+            dir.close(io);
         }
     }.impl);
 }
 @@ -1028,6 +1063,7 @@ test "Dir.rename directory onto non-empty dir" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             const test_dir_path = try ctx.transformPath("test_dir");
             const target_dir_path = try ctx.transformPath("target_dir_path");
 @@ -1035,15 +1071,15 @@ test "Dir.rename directory onto non-empty dir" {
             var target_dir = try ctx.dir.makeOpenPath(target_dir_path, .{});
             var file = try target_dir.createFile("test_file", .{ .read = true });
-            file.close();
+            file.close(io);
-            target_dir.close();
+            target_dir.close(io);
             // Rename should fail with PathAlreadyExists if target_dir is non-empty
             try testing.expectError(error.PathAlreadyExists, ctx.dir.rename(test_dir_path, target_dir_path));
             // Ensure the directory was not renamed
             var dir = try ctx.dir.openDir(test_dir_path, .{});
-            dir.close();
+            dir.close(io);
         }
     }.impl);
 }
 @@ -1054,11 +1090,12 @@ test "Dir.rename file <-> dir" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             const test_file_path = try ctx.transformPath("test_file");
             const test_dir_path = try ctx.transformPath("test_dir");
             var file = try ctx.dir.createFile(test_file_path, .{ .read = true });
-            file.close();
+            file.close(io);
             try ctx.dir.makeDir(test_dir_path);
             try testing.expectError(error.IsDir, ctx.dir.rename(test_file_path, test_dir_path));
             try testing.expectError(error.NotDir, ctx.dir.rename(test_dir_path, test_file_path));
 @@ -1067,6 +1104,8 @@ test "Dir.rename file <-> dir" {
 }
 test "rename" {
+    const io = testing.io;
     var tmp_dir1 = tmpDir(.{});
     defer tmp_dir1.cleanup();
 @@ -1077,19 +1116,21 @@ test "rename" {
     const test_file_name = "test_file";
     const renamed_test_file_name = "test_file_renamed";
     var file = try tmp_dir1.dir.createFile(test_file_name, .{ .read = true });
-    file.close();
+    file.close(io);
     try fs.rename(tmp_dir1.dir, test_file_name, tmp_dir2.dir, renamed_test_file_name);
     // ensure the file was renamed
     try testing.expectError(error.FileNotFound, tmp_dir1.dir.openFile(test_file_name, .{}));
     file = try tmp_dir2.dir.openFile(renamed_test_file_name, .{});
-    file.close();
+    file.close(io);
 }
 test "renameAbsolute" {
     if (native_os == .wasi) return error.SkipZigTest;
     if (native_os == .openbsd) return error.SkipZigTest;
+    const io = testing.io;
     var tmp_dir = tmpDir(.{});
     defer tmp_dir.cleanup();
 @@ -1109,7 +1150,7 @@ test "renameAbsolute" {
     const test_file_name = "test_file";
     const renamed_test_file_name = "test_file_renamed";
     var file = try tmp_dir.dir.createFile(test_file_name, .{ .read = true });
-    file.close();
+    file.close(io);
     try fs.renameAbsolute(
         try fs.path.join(allocator, &.{ base_path, test_file_name }),
         try fs.path.join(allocator, &.{ base_path, renamed_test_file_name }),
 @@ -1120,7 +1161,7 @@ test "renameAbsolute" {
     file = try tmp_dir.dir.openFile(renamed_test_file_name, .{});
     const stat = try file.stat();
     try testing.expectEqual(File.Kind.file, stat.kind);
-    file.close();
+    file.close(io);
     // Renaming directories
     const test_dir_name = "test_dir";
 @@ -1134,14 +1175,16 @@ test "renameAbsolute" {
     // ensure the directory was renamed
     try testing.expectError(error.FileNotFound, tmp_dir.dir.openDir(test_dir_name, .{}));
     var dir = try tmp_dir.dir.openDir(renamed_test_dir_name, .{});
-    dir.close();
+    dir.close(io);
 }
 test "openSelfExe" {
     if (native_os == .wasi) return error.SkipZigTest;
+    const io = testing.io;
     const self_exe_file = try std.fs.openSelfExe(.{});
-    self_exe_file.close();
+    self_exe_file.close(io);
 }
 test "selfExePath" {
 @@ -1155,13 +1198,15 @@ test "selfExePath" {
 }
 test "deleteTree does not follow symlinks" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     try tmp.dir.makePath("b");
     {
         var a = try tmp.dir.makeOpenPath("a", .{});
-        defer a.close();
+        defer a.close(io);
         try setupSymlink(a, "../b", "b", .{ .is_directory = true });
     }
 @@ -1257,27 +1302,31 @@ test "makePath but sub_path contains pre-existing file" {
     try testing.expectError(error.NotDir, tmp.dir.makePath("foo/bar/baz"));
 }
-fn expectDir(dir: Dir, path: []const u8) !void {
+fn expectDir(io: Io, dir: Dir, path: []const u8) !void {
     var d = try dir.openDir(path, .{});
-    d.close();
+    d.close(io);
 }
 test "makepath existing directories" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     try tmp.dir.makeDir("A");
     var tmpA = try tmp.dir.openDir("A", .{});
-    defer tmpA.close();
+    defer tmpA.close(io);
     try tmpA.makeDir("B");
     const testPath = "A" ++ fs.path.sep_str ++ "B" ++ fs.path.sep_str ++ "C";
     try tmp.dir.makePath(testPath);
-    try expectDir(tmp.dir, testPath);
+    try expectDir(io, tmp.dir, testPath);
 }
 test "makepath through existing valid symlink" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
 @@ -1286,10 +1335,12 @@ test "makepath through existing valid symlink" {
     try tmp.dir.makePath("working-symlink" ++ fs.path.sep_str ++ "in-realfolder");
-    try expectDir(tmp.dir, "realfolder" ++ fs.path.sep_str ++ "in-realfolder");
+    try expectDir(io, tmp.dir, "realfolder" ++ fs.path.sep_str ++ "in-realfolder");
 }
 test "makepath relative walks" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
 @@ -1305,21 +1356,23 @@ test "makepath relative walks" {
         .windows => {
             // On Windows, .. is resolved before passing the path to NtCreateFile,
             // meaning everything except `first/C` drops out.
-            try expectDir(tmp.dir, "first" ++ fs.path.sep_str ++ "C");
+            try expectDir(io, tmp.dir, "first" ++ fs.path.sep_str ++ "C");
             try testing.expectError(error.FileNotFound, tmp.dir.access("second", .{}));
             try testing.expectError(error.FileNotFound, tmp.dir.access("third", .{}));
         },
         else => {
-            try expectDir(tmp.dir, "first" ++ fs.path.sep_str ++ "A");
+            try expectDir(io, tmp.dir, "first" ++ fs.path.sep_str ++ "A");
-            try expectDir(tmp.dir, "first" ++ fs.path.sep_str ++ "B");
+            try expectDir(io, tmp.dir, "first" ++ fs.path.sep_str ++ "B");
-            try expectDir(tmp.dir, "first" ++ fs.path.sep_str ++ "C");
+            try expectDir(io, tmp.dir, "first" ++ fs.path.sep_str ++ "C");
-            try expectDir(tmp.dir, "second");
+            try expectDir(io, tmp.dir, "second");
-            try expectDir(tmp.dir, "third");
+            try expectDir(io, tmp.dir, "third");
         },
     }
 }
 test "makepath ignores '.'" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
 @@ -1337,14 +1390,14 @@ test "makepath ignores '.'" {
     try tmp.dir.makePath(dotPath);
-    try expectDir(tmp.dir, expectedPath);
+    try expectDir(io, tmp.dir, expectedPath);
 }
-fn testFilenameLimits(iterable_dir: Dir, maxed_filename: []const u8) !void {
+fn testFilenameLimits(io: Io, iterable_dir: Dir, maxed_filename: []const u8) !void {
     // setup, create a dir and a nested file both with maxed filenames, and walk the dir
     {
         var maxed_dir = try iterable_dir.makeOpenPath(maxed_filename, .{});
-        defer maxed_dir.close();
+        defer maxed_dir.close(io);
         try maxed_dir.writeFile(.{ .sub_path = maxed_filename, .data = "" });
 @@ -1364,6 +1417,8 @@ fn testFilenameLimits(iterable_dir: Dir, maxed_filename: []const u8) !void {
 }
 test "max file name component lengths" {
+    const io = testing.io;
     var tmp = tmpDir(.{ .iterate = true });
     defer tmp.cleanup();
 @@ -1371,16 +1426,16 @@ test "max file name component lengths" {
         // U+FFFF is the character with the largest code point that is encoded as a single
         // UTF-16 code unit, so Windows allows for NAME_MAX of them.
         const maxed_windows_filename = ("\u{FFFF}".*) ** windows.NAME_MAX;
-        try testFilenameLimits(tmp.dir, &maxed_windows_filename);
+        try testFilenameLimits(io, tmp.dir, &maxed_windows_filename);
     } else if (native_os == .wasi) {
         // On WASI, the maxed filename depends on the host OS, so in order for this test to
         // work on any host, we need to use a length that will work for all platforms
         // (i.e. the minimum max_name_bytes of all supported platforms).
         const maxed_wasi_filename = [_]u8{'1'} ** 255;
-        try testFilenameLimits(tmp.dir, &maxed_wasi_filename);
+        try testFilenameLimits(io, tmp.dir, &maxed_wasi_filename);
     } else {
         const maxed_ascii_filename = [_]u8{'1'} ** std.fs.max_name_bytes;
-        try testFilenameLimits(tmp.dir, &maxed_ascii_filename);
+        try testFilenameLimits(io, tmp.dir, &maxed_ascii_filename);
     }
 }
 @@ -1399,7 +1454,7 @@ test "writev, readv" {
     var read_vecs: [2][]u8 = .{ &buf2, &buf1 };
     var src_file = try tmp.dir.createFile("test.txt", .{ .read = true });
-    defer src_file.close();
+    defer src_file.close(io);
     var writer = src_file.writerStreaming(&.{});
 @@ -1429,7 +1484,7 @@ test "pwritev, preadv" {
     var read_vecs: [2][]u8 = .{ &buf2, &buf1 };
     var src_file = try tmp.dir.createFile("test.txt", .{ .read = true });
-    defer src_file.close();
+    defer src_file.close(io);
     var writer = src_file.writer(&.{});
 @@ -1459,7 +1514,7 @@ test "setEndPos" {
     const file_name = "afile.txt";
     try tmp.dir.writeFile(.{ .sub_path = file_name, .data = "ninebytes" });
     const f = try tmp.dir.openFile(file_name, .{ .mode = .read_write });
-    defer f.close();
+    defer f.close(io);
     const initial_size = try f.getEndPos();
     var buffer: [32]u8 = undefined;
 @@ -1522,21 +1577,21 @@ test "sendfile" {
     try tmp.dir.makePath("os_test_tmp");
     var dir = try tmp.dir.openDir("os_test_tmp", .{});
-    defer dir.close();
+    defer dir.close(io);
     const line1 = "line1\n";
     const line2 = "second line\n";
     var vecs = [_][]const u8{ line1, line2 };
     var src_file = try dir.createFile("sendfile1.txt", .{ .read = true });
-    defer src_file.close();
+    defer src_file.close(io);
     {
         var fw = src_file.writer(&.{});
         try fw.interface.writeVecAll(&vecs);
     }
     var dest_file = try dir.createFile("sendfile2.txt", .{ .read = true });
-    defer dest_file.close();
+    defer dest_file.close(io);
     const header1 = "header1\n";
     const header2 = "second header\n";
 @@ -1569,15 +1624,15 @@ test "sendfile with buffered data" {
     try tmp.dir.makePath("os_test_tmp");
     var dir = try tmp.dir.openDir("os_test_tmp", .{});
-    defer dir.close();
+    defer dir.close(io);
     var src_file = try dir.createFile("sendfile1.txt", .{ .read = true });
-    defer src_file.close();
+    defer src_file.close(io);
     try src_file.writeAll("AAAABBBB");
     var dest_file = try dir.createFile("sendfile2.txt", .{ .read = true });
-    defer dest_file.close();
+    defer dest_file.close(io);
     var src_buffer: [32]u8 = undefined;
     var file_reader = src_file.reader(io, &src_buffer);
 @@ -1659,10 +1714,11 @@ test "open file with exclusive nonblocking lock twice" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             const filename = try ctx.transformPath("file_nonblocking_lock_test.txt");
             const file1 = try ctx.dir.createFile(filename, .{ .lock = .exclusive, .lock_nonblocking = true });
-            defer file1.close();
+            defer file1.close(io);
             const file2 = ctx.dir.createFile(filename, .{ .lock = .exclusive, .lock_nonblocking = true });
             try testing.expectError(error.WouldBlock, file2);
 @@ -1675,10 +1731,11 @@ test "open file with shared and exclusive nonblocking lock" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             const filename = try ctx.transformPath("file_nonblocking_lock_test.txt");
             const file1 = try ctx.dir.createFile(filename, .{ .lock = .shared, .lock_nonblocking = true });
-            defer file1.close();
+            defer file1.close(io);
             const file2 = ctx.dir.createFile(filename, .{ .lock = .exclusive, .lock_nonblocking = true });
             try testing.expectError(error.WouldBlock, file2);
 @@ -1691,10 +1748,11 @@ test "open file with exclusive and shared nonblocking lock" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             const filename = try ctx.transformPath("file_nonblocking_lock_test.txt");
             const file1 = try ctx.dir.createFile(filename, .{ .lock = .exclusive, .lock_nonblocking = true });
-            defer file1.close();
+            defer file1.close(io);
             const file2 = ctx.dir.createFile(filename, .{ .lock = .shared, .lock_nonblocking = true });
             try testing.expectError(error.WouldBlock, file2);
 @@ -1707,10 +1765,11 @@ test "open file with exclusive lock twice, make sure second lock waits" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             const filename = try ctx.transformPath("file_lock_test.txt");
             const file = try ctx.dir.createFile(filename, .{ .lock = .exclusive });
-            errdefer file.close();
+            errdefer file.close(io);
             const S = struct {
                 fn checkFn(dir: *fs.Dir, path: []const u8, started: *std.Thread.ResetEvent, locked: *std.Thread.ResetEvent) !void {
 @@ -1718,7 +1777,7 @@ test "open file with exclusive lock twice, make sure second lock waits" {
                     const file1 = try dir.createFile(path, .{ .lock = .exclusive });
                     locked.set();
-                    file1.close();
+                    file1.close(io);
                 }
             };
 @@ -1739,7 +1798,7 @@ test "open file with exclusive lock twice, make sure second lock waits" {
             try testing.expectError(error.Timeout, locked.timedWait(10 * std.time.ns_per_ms));
             // Release the file lock which should unlock the thread to lock it and set the locked event.
-            file.close();
+            file.close(io);
             locked.wait();
         }
     }.impl);
 @@ -1748,6 +1807,8 @@ test "open file with exclusive lock twice, make sure second lock waits" {
 test "open file with exclusive nonblocking lock twice (absolute paths)" {
     if (native_os == .wasi) return error.SkipZigTest;
+    const io = testing.io;
     var random_bytes: [12]u8 = undefined;
     std.crypto.random.bytes(&random_bytes);
 @@ -1774,18 +1835,19 @@ test "open file with exclusive nonblocking lock twice (absolute paths)" {
         .lock = .exclusive,
         .lock_nonblocking = true,
     });
-    file1.close();
+    file1.close(io);
     try testing.expectError(error.WouldBlock, file2);
 }
 test "read from locked file" {
     try testWithAllSupportedPathTypes(struct {
         fn impl(ctx: *TestContext) !void {
+            const io = ctx.io;
             const filename = try ctx.transformPath("read_lock_file_test.txt");
             {
                 const f = try ctx.dir.createFile(filename, .{ .read = true });
-                defer f.close();
+                defer f.close(io);
                 var buffer: [1]u8 = undefined;
                 _ = try f.read(&buffer);
             }
 @@ -1794,9 +1856,9 @@ test "read from locked file" {
                     .read = true,
                     .lock = .exclusive,
                 });
-                defer f.close();
+                defer f.close(io);
                 const f2 = try ctx.dir.openFile(filename, .{});
-                defer f2.close();
+                defer f2.close(io);
                 var buffer: [1]u8 = undefined;
                 if (builtin.os.tag == .windows) {
                     try std.testing.expectError(error.LockViolation, f2.read(&buffer));
 @@ -1809,6 +1871,8 @@ test "read from locked file" {
 }
 test "walker" {
+    const io = testing.io;
     var tmp = tmpDir(.{ .iterate = true });
     defer tmp.cleanup();
 @@ -1857,13 +1921,15 @@ test "walker" {
         };
         // make sure that the entry.dir is the containing dir
         var entry_dir = try entry.dir.openDir(entry.basename, .{});
-        defer entry_dir.close();
+        defer entry_dir.close(io);
         num_walked += 1;
     }
     try testing.expectEqual(expected_paths.kvs.len, num_walked);
 }
 test "selective walker, skip entries that start with ." {
+    const io = testing.io;
     var tmp = tmpDir(.{ .iterate = true });
     defer tmp.cleanup();
 @@ -1923,7 +1989,7 @@ test "selective walker, skip entries that start with ." {
         // make sure that the entry.dir is the containing dir
         var entry_dir = try entry.dir.openDir(entry.basename, .{});
-        defer entry_dir.close();
+        defer entry_dir.close(io);
         num_walked += 1;
     }
     try testing.expectEqual(expected_paths.kvs.len, num_walked);
 @@ -1968,16 +2034,16 @@ test "'.' and '..' in fs.Dir functions" {
             try ctx.dir.makeDir(subdir_path);
             try ctx.dir.access(subdir_path, .{});
             var created_subdir = try ctx.dir.openDir(subdir_path, .{});
-            created_subdir.close();
+            created_subdir.close(io);
             const created_file = try ctx.dir.createFile(file_path, .{});
-            created_file.close();
+            created_file.close(io);
             try ctx.dir.access(file_path, .{});
             try ctx.dir.copyFile(file_path, ctx.dir, copy_path, .{});
             try ctx.dir.rename(copy_path, rename_path);
             const renamed_file = try ctx.dir.openFile(rename_path, .{});
-            renamed_file.close();
+            renamed_file.close(io);
             try ctx.dir.deleteFile(rename_path);
             try ctx.dir.writeFile(.{ .sub_path = update_path, .data = "something" });
 @@ -1994,6 +2060,8 @@ test "'.' and '..' in absolute functions" {
     if (native_os == .wasi) return error.SkipZigTest;
     if (native_os == .openbsd) return error.SkipZigTest;
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
 @@ -2007,11 +2075,11 @@ test "'.' and '..' in absolute functions" {
     try fs.makeDirAbsolute(subdir_path);
     try fs.accessAbsolute(subdir_path, .{});
     var created_subdir = try fs.openDirAbsolute(subdir_path, .{});
-    created_subdir.close();
+    created_subdir.close(io);
     const created_file_path = try fs.path.join(allocator, &.{ subdir_path, "../file" });
     const created_file = try fs.createFileAbsolute(created_file_path, .{});
-    created_file.close();
+    created_file.close(io);
     try fs.accessAbsolute(created_file_path, .{});
     const copied_file_path = try fs.path.join(allocator, &.{ subdir_path, "../copy" });
 @@ -2019,7 +2087,7 @@ test "'.' and '..' in absolute functions" {
     const renamed_file_path = try fs.path.join(allocator, &.{ subdir_path, "../rename" });
     try fs.renameAbsolute(copied_file_path, renamed_file_path);
     const renamed_file = try fs.openFileAbsolute(renamed_file_path, .{});
-    renamed_file.close();
+    renamed_file.close(io);
     try fs.deleteFileAbsolute(renamed_file_path);
     try fs.deleteDirAbsolute(subdir_path);
 @@ -2029,11 +2097,13 @@ test "chmod" {
     if (native_os == .windows or native_os == .wasi)
         return error.SkipZigTest;
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     const file = try tmp.dir.createFile("test_file", .{ .mode = 0o600 });
-    defer file.close();
+    defer file.close(io);
     try testing.expectEqual(@as(File.Mode, 0o600), (try file.stat()).mode & 0o7777);
     try file.chmod(0o644);
 @@ -2041,7 +2111,7 @@ test "chmod" {
     try tmp.dir.makeDir("test_dir");
     var dir = try tmp.dir.openDir("test_dir", .{ .iterate = true });
-    defer dir.close();
+    defer dir.close(io);
     try dir.chmod(0o700);
     try testing.expectEqual(@as(File.Mode, 0o700), (try dir.stat()).mode & 0o7777);
 @@ -2051,17 +2121,19 @@ test "chown" {
     if (native_os == .windows or native_os == .wasi)
         return error.SkipZigTest;
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     const file = try tmp.dir.createFile("test_file", .{});
-    defer file.close();
+    defer file.close(io);
     try file.chown(null, null);
     try tmp.dir.makeDir("test_dir");
     var dir = try tmp.dir.openDir("test_dir", .{ .iterate = true });
-    defer dir.close();
+    defer dir.close(io);
     try dir.chown(null, null);
 }
 @@ -2157,7 +2229,7 @@ test "read file non vectored" {
     const contents = "hello, world!\n";
     const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });
-    defer file.close();
+    defer file.close(io);
     {
         var file_writer: std.fs.File.Writer = .init(file, &.{});
         try file_writer.interface.writeAll(contents);
 @@ -2189,7 +2261,7 @@ test "seek keeping partial buffer" {
     const contents = "0123456789";
     const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });
-    defer file.close();
+    defer file.close(io);
     {
         var file_writer: std.fs.File.Writer = .init(file, &.{});
         try file_writer.interface.writeAll(contents);
 @@ -2231,7 +2303,7 @@ test "seekBy" {
     try tmp_dir.dir.writeFile(.{ .sub_path = "blah.txt", .data = "let's test seekBy" });
     const f = try tmp_dir.dir.openFile("blah.txt", .{ .mode = .read_only });
-    defer f.close();
+    defer f.close(io);
     var reader = f.readerStreaming(io, &.{});
     try reader.seekBy(2);
 @@ -2250,7 +2322,7 @@ test "seekTo flushes buffered data" {
     const contents = "data";
     const file = try tmp.dir.createFile("seek.bin", .{ .read = true });
-    defer file.close();
+    defer file.close(io);
     {
         var buf: [16]u8 = undefined;
         var file_writer = std.fs.File.writer(file, &buf);
 @@ -2277,9 +2349,9 @@ test "File.Writer sendfile with buffered contents" {
     {
         try tmp_dir.dir.writeFile(.{ .sub_path = "a", .data = "bcd" });
         const in = try tmp_dir.dir.openFile("a", .{});
-        defer in.close();
+        defer in.close(io);
         const out = try tmp_dir.dir.createFile("b", .{});
-        defer out.close();
+        defer out.close(io);
         var in_buf: [2]u8 = undefined;
         var in_r = in.reader(io, &in_buf);
 @@ -2294,7 +2366,7 @@ test "File.Writer sendfile with buffered contents" {
     }
     var check = try tmp_dir.dir.openFile("b", .{});
-    defer check.close();
+    defer check.close(io);
     var check_buf: [4]u8 = undefined;
     var check_r = check.reader(io, &check_buf);
     try testing.expectEqualStrings("abcd", try check_r.interface.take(4));

lib/std/http/Client.zig+3-1

...	@@ -1473,6 +1473,8 @@ pub const ConnectUnixError = Allocator.Error \|\| std.posix.SocketError \|\| error{N	...	@@ -1473,6 +1473,8 @@ pub const ConnectUnixError = Allocator.Error \|\| std.posix.SocketError \|\| error{N
1473	///	1473	///
1474	/// This function is threadsafe.	1474	/// This function is threadsafe.
1475	pub fn connectUnix(client: Client, path: []const u8) ConnectUnixError!Connection {	1475	pub fn connectUnix(client: Client, path: []const u8) ConnectUnixError!Connection {
		1476	const io = client.io;
		1477
1476	if (client.connection_pool.findConnection(.{	1478	if (client.connection_pool.findConnection(.{
1477	.host = path,	1479	.host = path,
1478	.port = 0,	1480	.port = 0,
...	@@ -1485,7 +1487,7 @@ pub fn connectUnix(client: Client, path: []const u8) ConnectUnixError!Connecti	...	@@ -1485,7 +1487,7 @@ pub fn connectUnix(client: Client, path: []const u8) ConnectUnixError!Connecti
1485	conn.* = .{ .data = undefined };	1487	conn.* = .{ .data = undefined };
1486		1488
1487	const stream = try Io.net.connectUnixSocket(path);	1489	const stream = try Io.net.connectUnixSocket(path);
1488	errdefer stream.close();	1490	errdefer stream.close(io);
1489		1491
1490	conn.data = .{	1492	conn.data = .{
1491	.stream = stream,	1493	.stream = stream,

lib/std/os/linux/IoUring.zig+63-22

lib/std/os/linux/test.zig+9-3

 @@ -12,12 +12,14 @@ const fs = std.fs;
 test "fallocate" {
     if (builtin.cpu.arch.isMIPS64() and (builtin.abi == .gnuabin32 or builtin.abi == .muslabin32)) return error.SkipZigTest; // https://codeberg.org/ziglang/zig/issues/30220
+    const io = std.testing.io;
     var tmp = std.testing.tmpDir(.{});
     defer tmp.cleanup();
     const path = "test_fallocate";
     const file = try tmp.dir.createFile(path, .{ .truncate = true, .mode = 0o666 });
-    defer file.close();
+    defer file.close(io);
     try expect((try file.stat()).size == 0);
 @@ -77,12 +79,14 @@ test "timer" {
 }
 test "statx" {
+    const io = std.testing.io;
     var tmp = std.testing.tmpDir(.{});
     defer tmp.cleanup();
     const tmp_file_name = "just_a_temporary_file.txt";
     var file = try tmp.dir.createFile(tmp_file_name, .{});
-    defer file.close();
+    defer file.close(io);
     var buf: linux.Statx = undefined;
     switch (linux.errno(linux.statx(file.handle, "", linux.AT.EMPTY_PATH, .BASIC_STATS, &buf))) {
 @@ -111,12 +115,14 @@ test "user and group ids" {
 }
 test "fadvise" {
+    const io = std.testing.io;
     var tmp = std.testing.tmpDir(.{});
     defer tmp.cleanup();
     const tmp_file_name = "temp_posix_fadvise.txt";
     var file = try tmp.dir.createFile(tmp_file_name, .{});
-    defer file.close();
+    defer file.close(io);
     var buf: [2048]u8 = undefined;
     try file.writeAll(&buf);

lib/std/posix/test.zig+38-16

 @@ -148,6 +148,8 @@ test "linkat with different directories" {
         else => return error.SkipZigTest,
     }
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
 @@ -163,10 +165,10 @@ test "linkat with different directories" {
     try posix.linkat(tmp.dir.fd, target_name, subdir.fd, link_name, 0);
     const efd = try tmp.dir.openFile(target_name, .{});
-    defer efd.close();
+    defer efd.close(io);
     const nfd = try subdir.openFile(link_name, .{});
-    defer nfd.close();
+    defer nfd.close(io);
     {
         const eino, _ = try getLinkInfo(efd.handle);
 @@ -381,6 +383,8 @@ test "mmap" {
     if (native_os == .windows or native_os == .wasi)
         return error.SkipZigTest;
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
 @@ -413,7 +417,7 @@ test "mmap" {
     // Create a file used for testing mmap() calls with a file descriptor
     {
         const file = try tmp.dir.createFile(test_out_file, .{});
-        defer file.close();
+        defer file.close(io);
         var stream = file.writer(&.{});
 @@ -426,7 +430,7 @@ test "mmap" {
     // Map the whole file
     {
         const file = try tmp.dir.openFile(test_out_file, .{});
-        defer file.close();
+        defer file.close(io);
         const data = try posix.mmap(
             null,
 @@ -451,7 +455,7 @@ test "mmap" {
     // Map the upper half of the file
     {
         const file = try tmp.dir.openFile(test_out_file, .{});
-        defer file.close();
+        defer file.close(io);
         const data = try posix.mmap(
             null,
 @@ -476,13 +480,15 @@ test "fcntl" {
     if (native_os == .windows or native_os == .wasi)
         return error.SkipZigTest;
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     const test_out_file = "os_tmp_test";
     const file = try tmp.dir.createFile(test_out_file, .{});
-    defer file.close();
+    defer file.close(io);
     // Note: The test assumes createFile opens the file with CLOEXEC
     {
 @@ -526,12 +532,14 @@ test "fsync" {
         else => return error.SkipZigTest,
     }
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     const test_out_file = "os_tmp_test";
     const file = try tmp.dir.createFile(test_out_file, .{});
-    defer file.close();
+    defer file.close(io);
     try posix.fsync(file.handle);
     try posix.fdatasync(file.handle);
 @@ -646,22 +654,24 @@ test "dup & dup2" {
         else => return error.SkipZigTest,
     }
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     {
         var file = try tmp.dir.createFile("os_dup_test", .{});
-        defer file.close();
+        defer file.close(io);
         var duped = std.fs.File{ .handle = try posix.dup(file.handle) };
-        defer duped.close();
+        defer duped.close(io);
         try duped.writeAll("dup");
         // Tests aren't run in parallel so using the next fd shouldn't be an issue.
         const new_fd = duped.handle + 1;
         try posix.dup2(file.handle, new_fd);
         var dup2ed = std.fs.File{ .handle = new_fd };
-        defer dup2ed.close();
+        defer dup2ed.close(io);
         try dup2ed.writeAll("dup2");
     }
 @@ -687,11 +697,13 @@ test "getppid" {
 test "writev longer than IOV_MAX" {
     if (native_os == .windows or native_os == .wasi) return error.SkipZigTest;
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     var file = try tmp.dir.createFile("pwritev", .{});
-    defer file.close();
+    defer file.close(io);
     const iovecs = [_]posix.iovec_const{.{ .base = "a", .len = 1 }} ** (posix.IOV_MAX + 1);
     const amt = try file.writev(&iovecs);
 @@ -709,12 +721,14 @@ test "POSIX file locking with fcntl" {
         return error.SkipZigTest;
     }
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     // Create a temporary lock file
     var file = try tmp.dir.createFile("lock", .{ .read = true });
-    defer file.close();
+    defer file.close(io);
     try file.setEndPos(2);
     const fd = file.handle;
 @@ -905,21 +919,25 @@ test "timerfd" {
 }
 test "isatty" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     var file = try tmp.dir.createFile("foo", .{});
-    defer file.close();
+    defer file.close(io);
     try expectEqual(posix.isatty(file.handle), false);
 }
 test "pread with empty buffer" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     var file = try tmp.dir.createFile("pread_empty", .{ .read = true });
-    defer file.close();
+    defer file.close(io);
     const bytes = try a.alloc(u8, 0);
     defer a.free(bytes);
 @@ -929,11 +947,13 @@ test "pread with empty buffer" {
 }
 test "write with empty buffer" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     var file = try tmp.dir.createFile("write_empty", .{});
-    defer file.close();
+    defer file.close(io);
     const bytes = try a.alloc(u8, 0);
     defer a.free(bytes);
 @@ -943,11 +963,13 @@ test "write with empty buffer" {
 }
 test "pwrite with empty buffer" {
+    const io = testing.io;
     var tmp = tmpDir(.{});
     defer tmp.cleanup();
     var file = try tmp.dir.createFile("pwrite_empty", .{});
-    defer file.close();
+    defer file.close(io);
     const bytes = try a.alloc(u8, 0);
     defer a.free(bytes);

lib/std/process.zig+7-5

 @@ -1,12 +1,14 @@
-const std = @import("std.zig");
 const builtin = @import("builtin");
+const native_os = builtin.os.tag;
+const std = @import("std.zig");
+const Io = std.Io;
 const fs = std.fs;
 const mem = std.mem;
 const math = std.math;
-const Allocator = mem.Allocator;
+const Allocator = std.mem.Allocator;
 const assert = std.debug.assert;
 const testing = std.testing;
-const native_os = builtin.os.tag;
 const posix = std.posix;
 const windows = std.os.windows;
 const unicode = std.unicode;
 @@ -1571,9 +1573,9 @@ pub fn getUserInfo(name: []const u8) !UserInfo {
 /// TODO this reads /etc/passwd. But sometimes the user/id mapping is in something else
 /// like NIS, AD, etc. See `man nss` or look at an strace for `id myuser`.
-pub fn posixGetUserInfo(name: []const u8) !UserInfo {
+pub fn posixGetUserInfo(io: Io, name: []const u8) !UserInfo {
     const file = try std.fs.openFileAbsolute("/etc/passwd", .{});
-    defer file.close();
+    defer file.close(io);
     var buffer: [4096]u8 = undefined;
     var file_reader = file.reader(&buffer);
     return posixGetUserInfoPasswdStream(name, &file_reader.interface) catch |err| switch (err) {

lib/std/process/Child.zig+22-21

 @@ -4,6 +4,7 @@ const builtin = @import("builtin");
 const native_os = builtin.os.tag;
 const std = @import("../std.zig");
+const Io = std.Io;
 const unicode = std.unicode;
 const fs = std.fs;
 const process = std.process;
 @@ -277,17 +278,17 @@ pub fn spawnAndWait(self: *ChildProcess) SpawnError!Term {
 }
 /// Forcibly terminates child process and then cleans up all resources.
-pub fn kill(self: *ChildProcess) !Term {
+pub fn kill(self: *ChildProcess, io: Io) !Term {
     if (native_os == .windows) {
-        return self.killWindows(1);
+        return self.killWindows(io, 1);
     } else {
-        return self.killPosix();
+        return self.killPosix(io);
     }
 }
-pub fn killWindows(self: *ChildProcess, exit_code: windows.UINT) !Term {
+pub fn killWindows(self: *ChildProcess, io: Io, exit_code: windows.UINT) !Term {
     if (self.term) |term| {
-        self.cleanupStreams();
+        self.cleanupStreams(io);
         return term;
     }
 @@ -303,20 +304,20 @@ pub fn killWindows(self: *ChildProcess, exit_code: windows.UINT) !Term {
         },
         else => return err,
     };
-    try self.waitUnwrappedWindows();
+    try self.waitUnwrappedWindows(io);
     return self.term.?;
 }
-pub fn killPosix(self: *ChildProcess) !Term {
+pub fn killPosix(self: *ChildProcess, io: Io) !Term {
     if (self.term) |term| {
-        self.cleanupStreams();
+        self.cleanupStreams(io);
         return term;
     }
     posix.kill(self.id, posix.SIG.TERM) catch |err| switch (err) {
         error.ProcessNotFound => return error.AlreadyTerminated,
         else => return err,
     };
-    self.waitUnwrappedPosix();
+    self.waitUnwrappedPosix(io);
     return self.term.?;
 }
 @@ -354,15 +355,15 @@ pub fn waitForSpawn(self: *ChildProcess) SpawnError!void {
 }
 /// Blocks until child process terminates and then cleans up all resources.
-pub fn wait(self: *ChildProcess) WaitError!Term {
+pub fn wait(self: *ChildProcess, io: Io) WaitError!Term {
     try self.waitForSpawn(); // report spawn errors
     if (self.term) |term| {
-        self.cleanupStreams();
+        self.cleanupStreams(io);
         return term;
     }
     switch (native_os) {
-        .windows => try self.waitUnwrappedWindows(),
+        .windows => try self.waitUnwrappedWindows(io),
-        else => self.waitUnwrappedPosix(),
+        else => self.waitUnwrappedPosix(io),
     }
     self.id = undefined;
     return self.term.?;
 @@ -474,7 +475,7 @@ pub fn run(args: struct {
     };
 }
-fn waitUnwrappedWindows(self: *ChildProcess) WaitError!void {
+fn waitUnwrappedWindows(self: *ChildProcess, io: Io) WaitError!void {
     const result = windows.WaitForSingleObjectEx(self.id, windows.INFINITE, false);
     self.term = @as(SpawnError!Term, x: {
 @@ -492,11 +493,11 @@ fn waitUnwrappedWindows(self: *ChildProcess) WaitError!void {
     posix.close(self.id);
     posix.close(self.thread_handle);
-    self.cleanupStreams();
+    self.cleanupStreams(io);
     return result;
 }
-fn waitUnwrappedPosix(self: *ChildProcess) void {
+fn waitUnwrappedPosix(self: *ChildProcess, io: Io) void {
     const res: posix.WaitPidResult = res: {
         if (self.request_resource_usage_statistics) {
             switch (native_os) {
 @@ -527,7 +528,7 @@ fn waitUnwrappedPosix(self: *ChildProcess) void {
         break :res posix.waitpid(self.id, 0);
     };
     const status = res.status;
-    self.cleanupStreams();
+    self.cleanupStreams(io);
     self.handleWaitResult(status);
 }
 @@ -535,17 +536,17 @@ fn handleWaitResult(self: *ChildProcess, status: u32) void {
     self.term = statusToTerm(status);
 }
-fn cleanupStreams(self: *ChildProcess) void {
+fn cleanupStreams(self: *ChildProcess, io: Io) void {
     if (self.stdin) |*stdin| {
-        stdin.close();
+        stdin.close(io);
         self.stdin = null;
     }
     if (self.stdout) |*stdout| {
-        stdout.close();
+        stdout.close(io);
         self.stdout = null;
     }
     if (self.stderr) |*stderr| {
-        stderr.close();
+        stderr.close(io);
         self.stderr = null;
     }
 }

lib/std/tar.zig+40-31

 @@ -16,6 +16,7 @@
 //! pax reference: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/pax.html#tag_20_92_13
 const std = @import("std");
+const Io = std.Io;
 const assert = std.debug.assert;
 const testing = std.testing;
 @@ -302,7 +303,7 @@ pub const FileKind = enum {
 /// Iterator over entries in the tar file represented by reader.
 pub const Iterator = struct {
-    reader: *std.Io.Reader,
+    reader: *Io.Reader,
     diagnostics: ?*Diagnostics = null,
     // buffers for heeader and file attributes
 @@ -328,7 +329,7 @@ pub const Iterator = struct {
     /// Iterates over files in tar archive.
     /// `next` returns each file in tar archive.
-    pub fn init(reader: *std.Io.Reader, options: Options) Iterator {
+    pub fn init(reader: *Io.Reader, options: Options) Iterator {
         return .{
             .reader = reader,
             .diagnostics = options.diagnostics,
 @@ -473,7 +474,7 @@ pub const Iterator = struct {
         return null;
     }
-    pub fn streamRemaining(it: *Iterator, file: File, w: *std.Io.Writer) std.Io.Reader.StreamError!void {
+    pub fn streamRemaining(it: *Iterator, file: File, w: *Io.Writer) Io.Reader.StreamError!void {
         try it.reader.streamExact64(w, file.size);
         it.unread_file_bytes = 0;
     }
 @@ -499,14 +500,14 @@ const pax_max_size_attr_len = 64;
 pub const PaxIterator = struct {
     size: usize, // cumulative size of all pax attributes
-    reader: *std.Io.Reader,
+    reader: *Io.Reader,
     const Self = @This();
     const Attribute = struct {
         kind: PaxAttributeKind,
         len: usize, // length of the attribute value
-        reader: *std.Io.Reader, // reader positioned at value start
+        reader: *Io.Reader, // reader positioned at value start
         // Copies pax attribute value into destination buffer.
         // Must be called with destination buffer of size at least Attribute.len.
 @@ -573,13 +574,13 @@ pub const PaxIterator = struct {
     }
     // Checks that each record ends with new line.
-    fn validateAttributeEnding(reader: *std.Io.Reader) !void {
+    fn validateAttributeEnding(reader: *Io.Reader) !void {
         if (try reader.takeByte() != '\n') return error.PaxInvalidAttributeEnd;
     }
 };
 /// Saves tar file content to the file systems.
-pub fn pipeToFileSystem(dir: std.fs.Dir, reader: *std.Io.Reader, options: PipeOptions) !void {
+pub fn pipeToFileSystem(io: Io, dir: Io.Dir, reader: *Io.Reader, options: PipeOptions) !void {
     var file_name_buffer: [std.fs.max_path_bytes]u8 = undefined;
     var link_name_buffer: [std.fs.max_path_bytes]u8 = undefined;
     var file_contents_buffer: [1024]u8 = undefined;
 @@ -610,7 +611,7 @@ pub fn pipeToFileSystem(dir: std.fs.Dir, reader: *std.Io.Reader, options: PipeOp
             },
             .file => {
                 if (createDirAndFile(dir, file_name, fileMode(file.mode, options))) |fs_file| {
-                    defer fs_file.close();
+                    defer fs_file.close(io);
                     var file_writer = fs_file.writer(&file_contents_buffer);
                     try it.streamRemaining(file, &file_writer.interface);
                     try file_writer.interface.flush();
 @@ -637,7 +638,7 @@ pub fn pipeToFileSystem(dir: std.fs.Dir, reader: *std.Io.Reader, options: PipeOp
     }
 }
-fn createDirAndFile(dir: std.fs.Dir, file_name: []const u8, mode: std.fs.File.Mode) !std.fs.File {
+fn createDirAndFile(dir: Io.Dir, file_name: []const u8, mode: Io.File.Mode) !Io.File {
     const fs_file = dir.createFile(file_name, .{ .exclusive = true, .mode = mode }) catch |err| {
         if (err == error.FileNotFound) {
             if (std.fs.path.dirname(file_name)) |dir_name| {
 @@ -651,7 +652,7 @@ fn createDirAndFile(dir: std.fs.Dir, file_name: []const u8, mode: std.fs.File.Mo
 }
 // Creates a symbolic link at path `file_name` which points to `link_name`.
-fn createDirAndSymlink(dir: std.fs.Dir, link_name: []const u8, file_name: []const u8) !void {
+fn createDirAndSymlink(dir: Io.Dir, link_name: []const u8, file_name: []const u8) !void {
     dir.symLink(link_name, file_name, .{}) catch |err| {
         if (err == error.FileNotFound) {
             if (std.fs.path.dirname(file_name)) |dir_name| {
 @@ -783,7 +784,7 @@ test PaxIterator {
     var buffer: [1024]u8 = undefined;
     outer: for (cases) |case| {
-        var reader: std.Io.Reader = .fixed(case.data);
+        var reader: Io.Reader = .fixed(case.data);
         var it: PaxIterator = .{
             .size = case.data.len,
             .reader = &reader,
 @@ -874,13 +875,15 @@ test "header parse mode" {
 }
 test "create file and symlink" {
+    const io = testing.io;
     var root = testing.tmpDir(.{});
     defer root.cleanup();
     var file = try createDirAndFile(root.dir, "file1", default_mode);
-    file.close();
+    file.close(io);
     file = try createDirAndFile(root.dir, "a/b/c/file2", default_mode);
-    file.close();
+    file.close(io);
     createDirAndSymlink(root.dir, "a/b/c/file2", "symlink1") catch |err| {
         // On Windows when developer mode is not enabled
 @@ -892,7 +895,7 @@ test "create file and symlink" {
     // Danglink symlnik, file created later
     try createDirAndSymlink(root.dir, "../../../g/h/i/file4", "j/k/l/symlink3");
     file = try createDirAndFile(root.dir, "g/h/i/file4", default_mode);
-    file.close();
+    file.close(io);
 }
 test Iterator {
 @@ -916,7 +919,7 @@ test Iterator {
     //    example/empty/
     const data = @embedFile("tar/testdata/example.tar");
-    var reader: std.Io.Reader = .fixed(data);
+    var reader: Io.Reader = .fixed(data);
     // User provided buffers to the iterator
     var file_name_buffer: [std.fs.max_path_bytes]u8 = undefined;
 @@ -942,7 +945,7 @@ test Iterator {
             .file => {
                 try testing.expectEqualStrings("example/a/file", file.name);
                 var buf: [16]u8 = undefined;
-                var w: std.Io.Writer = .fixed(&buf);
+                var w: Io.Writer = .fixed(&buf);
                 try it.streamRemaining(file, &w);
                 try testing.expectEqualStrings("content\n", w.buffered());
             },
 @@ -955,6 +958,7 @@ test Iterator {
 }
 test pipeToFileSystem {
+    const io = testing.io;
     // Example tar file is created from this tree structure:
     // $ tree example
     //    example
 @@ -975,14 +979,14 @@ test pipeToFileSystem {
     //    example/empty/
     const data = @embedFile("tar/testdata/example.tar");
-    var reader: std.Io.Reader = .fixed(data);
+    var reader: Io.Reader = .fixed(data);
     var tmp = testing.tmpDir(.{ .follow_symlinks = false });
     defer tmp.cleanup();
     const dir = tmp.dir;
     // Save tar from reader to the file system `dir`
-    pipeToFileSystem(dir, &reader, .{
+    pipeToFileSystem(io, dir, &reader, .{
         .mode_mode = .ignore,
         .strip_components = 1,
         .exclude_empty_directories = true,
 @@ -1005,8 +1009,9 @@ test pipeToFileSystem {
 }
 test "pipeToFileSystem root_dir" {
+    const io = testing.io;
     const data = @embedFile("tar/testdata/example.tar");
-    var reader: std.Io.Reader = .fixed(data);
+    var reader: Io.Reader = .fixed(data);
     // with strip_components = 1
     {
 @@ -1015,7 +1020,7 @@ test "pipeToFileSystem root_dir" {
         var diagnostics: Diagnostics = .{ .allocator = testing.allocator };
         defer diagnostics.deinit();
-        pipeToFileSystem(tmp.dir, &reader, .{
+        pipeToFileSystem(io, tmp.dir, &reader, .{
             .strip_components = 1,
             .diagnostics = &diagnostics,
         }) catch |err| {
 @@ -1037,7 +1042,7 @@ test "pipeToFileSystem root_dir" {
         var diagnostics: Diagnostics = .{ .allocator = testing.allocator };
         defer diagnostics.deinit();
-        pipeToFileSystem(tmp.dir, &reader, .{
+        pipeToFileSystem(io, tmp.dir, &reader, .{
             .strip_components = 0,
             .diagnostics = &diagnostics,
         }) catch |err| {
 @@ -1053,43 +1058,46 @@ test "pipeToFileSystem root_dir" {
 }
 test "findRoot with single file archive" {
+    const io = testing.io;
     const data = @embedFile("tar/testdata/22752.tar");
-    var reader: std.Io.Reader = .fixed(data);
+    var reader: Io.Reader = .fixed(data);
     var tmp = testing.tmpDir(.{});
     defer tmp.cleanup();
     var diagnostics: Diagnostics = .{ .allocator = testing.allocator };
     defer diagnostics.deinit();
-    try pipeToFileSystem(tmp.dir, &reader, .{ .diagnostics = &diagnostics });
+    try pipeToFileSystem(io, tmp.dir, &reader, .{ .diagnostics = &diagnostics });
     try testing.expectEqualStrings("", diagnostics.root_dir);
 }
 test "findRoot without explicit root dir" {
+    const io = testing.io;
     const data = @embedFile("tar/testdata/19820.tar");
-    var reader: std.Io.Reader = .fixed(data);
+    var reader: Io.Reader = .fixed(data);
     var tmp = testing.tmpDir(.{});
     defer tmp.cleanup();
     var diagnostics: Diagnostics = .{ .allocator = testing.allocator };
     defer diagnostics.deinit();
-    try pipeToFileSystem(tmp.dir, &reader, .{ .diagnostics = &diagnostics });
+    try pipeToFileSystem(io, tmp.dir, &reader, .{ .diagnostics = &diagnostics });
     try testing.expectEqualStrings("root", diagnostics.root_dir);
 }
 test "pipeToFileSystem strip_components" {
+    const io = testing.io;
     const data = @embedFile("tar/testdata/example.tar");
-    var reader: std.Io.Reader = .fixed(data);
+    var reader: Io.Reader = .fixed(data);
     var tmp = testing.tmpDir(.{ .follow_symlinks = false });
     defer tmp.cleanup();
     var diagnostics: Diagnostics = .{ .allocator = testing.allocator };
     defer diagnostics.deinit();
-    pipeToFileSystem(tmp.dir, &reader, .{
+    pipeToFileSystem(io, tmp.dir, &reader, .{
         .strip_components = 3,
         .diagnostics = &diagnostics,
     }) catch |err| {
 @@ -1110,10 +1118,10 @@ fn normalizePath(bytes: []u8) []u8 {
     return bytes;
 }
-const default_mode = std.fs.File.default_mode;
+const default_mode = Io.File.default_mode;
 // File system mode based on tar header mode and mode_mode options.
-fn fileMode(mode: u32, options: PipeOptions) std.fs.File.Mode {
+fn fileMode(mode: u32, options: PipeOptions) Io.File.Mode {
     if (!std.fs.has_executable_bit or options.mode_mode == .ignore)
         return default_mode;
 @@ -1139,16 +1147,17 @@ test fileMode {
 test "executable bit" {
     if (!std.fs.has_executable_bit) return error.SkipZigTest;
+    const io = testing.io;
     const S = std.posix.S;
     const data = @embedFile("tar/testdata/example.tar");
     for ([_]PipeOptions.ModeMode{ .ignore, .executable_bit_only }) |opt| {
-        var reader: std.Io.Reader = .fixed(data);
+        var reader: Io.Reader = .fixed(data);
         var tmp = testing.tmpDir(.{ .follow_symlinks = false });
         //defer tmp.cleanup();
-        pipeToFileSystem(tmp.dir, &reader, .{
+        pipeToFileSystem(io, tmp.dir, &reader, .{
             .strip_components = 1,
             .exclude_empty_directories = true,
             .mode_mode = opt,

lib/std/tar/test.zig+5-3

 @@ -424,6 +424,7 @@ test "insufficient buffer in Header name filed" {
 }
 test "should not overwrite existing file" {
+    const io = testing.io;
     // Starting from this folder structure:
     // $ tree root
     //    root
 @@ -469,17 +470,18 @@ test "should not overwrite existing file" {
     defer root.cleanup();
     try testing.expectError(
         error.PathAlreadyExists,
-        tar.pipeToFileSystem(root.dir, &r, .{ .mode_mode = .ignore, .strip_components = 1 }),
+        tar.pipeToFileSystem(io, root.dir, &r, .{ .mode_mode = .ignore, .strip_components = 1 }),
     );
     // Unpack with strip_components = 0 should pass
     r = .fixed(data);
     var root2 = std.testing.tmpDir(.{});
     defer root2.cleanup();
-    try tar.pipeToFileSystem(root2.dir, &r, .{ .mode_mode = .ignore, .strip_components = 0 });
+    try tar.pipeToFileSystem(io, root2.dir, &r, .{ .mode_mode = .ignore, .strip_components = 0 });
 }
 test "case sensitivity" {
+    const io = testing.io;
     // Mimicking issue #18089, this tar contains, same file name in two case
     // sensitive name version. Should fail on case insensitive file systems.
     //
 @@ -495,7 +497,7 @@ test "case sensitivity" {
     var root = std.testing.tmpDir(.{});
     defer root.cleanup();
-    tar.pipeToFileSystem(root.dir, &r, .{ .mode_mode = .ignore, .strip_components = 1 }) catch |err| {
+    tar.pipeToFileSystem(io, root.dir, &r, .{ .mode_mode = .ignore, .strip_components = 1 }) catch |err| {
         // on case insensitive fs we fail on overwrite existing file
         try testing.expectEqual(error.PathAlreadyExists, err);
         return;

lib/std/testing.zig+3-3

lib/std/zig/LibCInstallation.zig+40-31

 @@ -1,4 +1,18 @@
 //! See the render function implementation for documentation of the fields.
+const LibCInstallation = @This();
+const builtin = @import("builtin");
+const is_darwin = builtin.target.os.tag.isDarwin();
+const is_windows = builtin.target.os.tag == .windows;
+const is_haiku = builtin.target.os.tag == .haiku;
+const std = @import("std");
+const Io = std.Io;
+const Target = std.Target;
+const fs = std.fs;
+const Allocator = std.mem.Allocator;
+const Path = std.Build.Cache.Path;
+const log = std.log.scoped(.libc_installation);
 include_dir: ?[]const u8 = null,
 sys_include_dir: ?[]const u8 = null,
 @@ -157,6 +171,7 @@ pub fn render(self: LibCInstallation, out: *std.Io.Writer) !void {
 pub const FindNativeOptions = struct {
     allocator: Allocator,
+    io: Io,
     target: *const std.Target,
     /// If enabled, will print human-friendly errors to stderr.
 @@ -165,29 +180,32 @@ pub const FindNativeOptions = struct {
 /// Finds the default, native libc.
 pub fn findNative(args: FindNativeOptions) FindError!LibCInstallation {
+    const gpa = args.allocator;
+    const io = args.io;
     var self: LibCInstallation = .{};
     if (is_darwin and args.target.os.tag.isDarwin()) {
-        if (!std.zig.system.darwin.isSdkInstalled(args.allocator))
+        if (!std.zig.system.darwin.isSdkInstalled(gpa))
             return error.DarwinSdkNotFound;
-        const sdk = std.zig.system.darwin.getSdk(args.allocator, args.target) orelse
+        const sdk = std.zig.system.darwin.getSdk(gpa, args.target) orelse
             return error.DarwinSdkNotFound;
-        defer args.allocator.free(sdk);
+        defer gpa.free(sdk);
-        self.include_dir = try fs.path.join(args.allocator, &.{
+        self.include_dir = try fs.path.join(gpa, &.{
             sdk, "usr/include",
         });
-        self.sys_include_dir = try fs.path.join(args.allocator, &.{
+        self.sys_include_dir = try fs.path.join(gpa, &.{
             sdk, "usr/include",
         });
         return self;
     } else if (is_windows) {
-        const sdk = std.zig.WindowsSdk.find(args.allocator, args.target.cpu.arch) catch |err| switch (err) {
+        const sdk = std.zig.WindowsSdk.find(gpa, io, args.target.cpu.arch) catch |err| switch (err) {
             error.NotFound => return error.WindowsSdkNotFound,
             error.PathTooLong => return error.WindowsSdkNotFound,
             error.OutOfMemory => return error.OutOfMemory,
         };
-        defer sdk.free(args.allocator);
+        defer sdk.free(gpa);
         try self.findNativeMsvcIncludeDir(args, sdk);
         try self.findNativeMsvcLibDir(args, sdk);
 @@ -197,16 +215,16 @@ pub fn findNative(args: FindNativeOptions) FindError!LibCInstallation {
     } else if (is_haiku) {
         try self.findNativeIncludeDirPosix(args);
         try self.findNativeGccDirHaiku(args);
-        self.crt_dir = try args.allocator.dupeZ(u8, "/system/develop/lib");
+        self.crt_dir = try gpa.dupeZ(u8, "/system/develop/lib");
     } else if (builtin.target.os.tag == .illumos) {
         // There is only one libc, and its headers/libraries are always in the same spot.
-        self.include_dir = try args.allocator.dupeZ(u8, "/usr/include");
+        self.include_dir = try gpa.dupeZ(u8, "/usr/include");
-        self.sys_include_dir = try args.allocator.dupeZ(u8, "/usr/include");
+        self.sys_include_dir = try gpa.dupeZ(u8, "/usr/include");
-        self.crt_dir = try args.allocator.dupeZ(u8, "/usr/lib/64");
+        self.crt_dir = try gpa.dupeZ(u8, "/usr/lib/64");
     } else if (std.process.can_spawn) {
         try self.findNativeIncludeDirPosix(args);
         switch (builtin.target.os.tag) {
-            .freebsd, .netbsd, .openbsd, .dragonfly => self.crt_dir = try args.allocator.dupeZ(u8, "/usr/lib"),
+            .freebsd, .netbsd, .openbsd, .dragonfly => self.crt_dir = try gpa.dupeZ(u8, "/usr/lib"),
             .linux => try self.findNativeCrtDirPosix(args),
             else => {},
         }
 @@ -229,6 +247,7 @@ pub fn deinit(self: *LibCInstallation, allocator: Allocator) void {
 fn findNativeIncludeDirPosix(self: *LibCInstallation, args: FindNativeOptions) FindError!void {
     const allocator = args.allocator;
+    const io = args.io;
     // Detect infinite loops.
     var env_map = std.process.getEnvMap(allocator) catch |err| switch (err) {
 @@ -326,7 +345,7 @@ fn findNativeIncludeDirPosix(self: *LibCInstallation, args: FindNativeOptions) F
             else => return error.FileSystem,
         };
-        defer search_dir.close();
+        defer search_dir.close(io);
         if (self.include_dir == null) {
             if (search_dir.access(include_dir_example_file, .{})) |_| {
 @@ -361,6 +380,7 @@ fn findNativeIncludeDirWindows(
     sdk: std.zig.WindowsSdk,
 ) FindError!void {
     const allocator = args.allocator;
+    const io = args.io;
     var install_buf: [2]std.zig.WindowsSdk.Installation = undefined;
     const installs = fillInstallations(&install_buf, sdk);
 @@ -380,7 +400,7 @@ fn findNativeIncludeDirWindows(
             else => return error.FileSystem,
         };
-        defer dir.close();
+        defer dir.close(io);
         dir.access("stdlib.h", .{}) catch |err| switch (err) {
             error.FileNotFound => continue,
 @@ -400,6 +420,7 @@ fn findNativeCrtDirWindows(
     sdk: std.zig.WindowsSdk,
 ) FindError!void {
     const allocator = args.allocator;
+    const io = args.io;
     var install_buf: [2]std.zig.WindowsSdk.Installation = undefined;
     const installs = fillInstallations(&install_buf, sdk);
 @@ -427,7 +448,7 @@ fn findNativeCrtDirWindows(
             else => return error.FileSystem,
         };
-        defer dir.close();
+        defer dir.close(io);
         dir.access("ucrt.lib", .{}) catch |err| switch (err) {
             error.FileNotFound => continue,
 @@ -467,6 +488,7 @@ fn findNativeKernel32LibDir(
     sdk: std.zig.WindowsSdk,
 ) FindError!void {
     const allocator = args.allocator;
+    const io = args.io;
     var install_buf: [2]std.zig.WindowsSdk.Installation = undefined;
     const installs = fillInstallations(&install_buf, sdk);
 @@ -494,7 +516,7 @@ fn findNativeKernel32LibDir(
             else => return error.FileSystem,
         };
-        defer dir.close();
+        defer dir.close(io);
         dir.access("kernel32.lib", .{}) catch |err| switch (err) {
             error.FileNotFound => continue,
 @@ -513,6 +535,7 @@ fn findNativeMsvcIncludeDir(
     sdk: std.zig.WindowsSdk,
 ) FindError!void {
     const allocator = args.allocator;
+    const io = args.io;
     const msvc_lib_dir = sdk.msvc_lib_dir orelse return error.LibCStdLibHeaderNotFound;
     const up1 = fs.path.dirname(msvc_lib_dir) orelse return error.LibCStdLibHeaderNotFound;
 @@ -529,7 +552,7 @@ fn findNativeMsvcIncludeDir(
         else => return error.FileSystem,
     };
-    defer dir.close();
+    defer dir.close(io);
     dir.access("vcruntime.h", .{}) catch |err| switch (err) {
         error.FileNotFound => return error.LibCStdLibHeaderNotFound,
 @@ -1015,17 +1038,3 @@ pub fn resolveCrtPaths(
         },
     }
 }
-const LibCInstallation = @This();
-const std = @import("std");
-const builtin = @import("builtin");
-const Target = std.Target;
-const fs = std.fs;
-const Allocator = std.mem.Allocator;
-const Path = std.Build.Cache.Path;
-const is_darwin = builtin.target.os.tag.isDarwin();
-const is_windows = builtin.target.os.tag == .windows;
-const is_haiku = builtin.target.os.tag == .haiku;
-const log = std.log.scoped(.libc_installation);

lib/std/zig/WindowsSdk.zig+38-29

lib/std/zig/llvm/Builder.zig+11-8

 @@ -1,14 +1,17 @@
+const builtin = @import("builtin");
+const Builder = @This();
 const std = @import("../../std.zig");
+const Io = std.Io;
 const Allocator = std.mem.Allocator;
 const assert = std.debug.assert;
-const bitcode_writer = @import("bitcode_writer.zig");
-const Builder = @This();
-const builtin = @import("builtin");
 const DW = std.dwarf;
-const ir = @import("ir.zig");
 const log = std.log.scoped(.llvm);
 const Writer = std.Io.Writer;
+const bitcode_writer = @import("bitcode_writer.zig");
+const ir = @import("ir.zig");
 gpa: Allocator,
 strip: bool,
 @@ -9579,11 +9582,11 @@ pub fn dump(b: *Builder) void {
     b.printToFile(stderr, &buffer) catch {};
 }
-pub fn printToFilePath(b: *Builder, dir: std.fs.Dir, path: []const u8) !void {
+pub fn printToFilePath(b: *Builder, io: Io, dir: std.fs.Dir, path: []const u8) !void {
     var buffer: [4000]u8 = undefined;
-    const file = try dir.createFile(path, .{});
+    const file = try dir.createFile(io, path, .{});
-    defer file.close();
+    defer file.close(io);
-    try b.printToFile(file, &buffer);
+    try b.printToFile(io, file, &buffer);
 }
 pub fn printToFile(b: *Builder, file: std.fs.File, buffer: []u8) !void {

lib/std/zig/system.zig+2-2

...	@@ -847,7 +847,7 @@ fn glibcVerFromRPath(io: Io, rpath: []const u8) !std.SemanticVersion {	...	@@ -847,7 +847,7 @@ fn glibcVerFromRPath(io: Io, rpath: []const u8) !std.SemanticVersion {
847	error.Unexpected => \|e\| return e,	847	error.Unexpected => \|e\| return e,
848	error.Canceled => \|e\| return e,	848	error.Canceled => \|e\| return e,
849	};	849	};
850	defer file.close();	850	defer file.close(io);
851		851
852	// Empirically, glibc 2.34 libc.so .dynstr section is 32441 bytes on my system.	852	// Empirically, glibc 2.34 libc.so .dynstr section is 32441 bytes on my system.
853	var buffer: [8000]u8 = undefined;	853	var buffer: [8000]u8 = undefined;
...	@@ -1051,7 +1051,7 @@ fn detectAbiAndDynamicLinker(io: Io, cpu: Target.Cpu, os: Target.Os, query: Targ	...	@@ -1051,7 +1051,7 @@ fn detectAbiAndDynamicLinker(io: Io, cpu: Target.Cpu, os: Target.Os, query: Targ
1051	else => \|e\| return e,	1051	else => \|e\| return e,
1052	};	1052	};
1053	var is_elf_file = false;	1053	var is_elf_file = false;
1054	defer if (!is_elf_file) file.close();	1054	defer if (!is_elf_file) file.close(io);
1055		1055
1056	file_reader = .initAdapted(file, io, &file_reader_buffer);	1056	file_reader = .initAdapted(file, io, &file_reader_buffer);
1057	file_name = undefined; // it aliases file_reader_buffer	1057	file_name = undefined; // it aliases file_reader_buffer

lib/std/zig/system/linux.zig+1-1

...	@@ -447,7 +447,7 @@ pub fn detectNativeCpuAndFeatures(io: Io) ?Target.Cpu {	...	@@ -447,7 +447,7 @@ pub fn detectNativeCpuAndFeatures(io: Io) ?Target.Cpu {
447	var file = fs.openFileAbsolute("/proc/cpuinfo", .{}) catch \|err\| switch (err) {	447	var file = fs.openFileAbsolute("/proc/cpuinfo", .{}) catch \|err\| switch (err) {
448	else => return null,	448	else => return null,
449	};	449	};
450	defer file.close();	450	defer file.close(io);
451		451
452	var buffer: [4096]u8 = undefined; // "flags" lines can get pretty long.	452	var buffer: [4096]u8 = undefined; // "flags" lines can get pretty long.
453	var file_reader = file.reader(io, &buffer);	453	var file_reader = file.reader(io, &buffer);

lib/std/zip.zig+4-2

 @@ -554,17 +554,19 @@ pub const Iterator = struct {
                 return;
             }
+            const io = stream.io;
             const out_file = blk: {
                 if (std.fs.path.dirname(filename)) |dirname| {
                     var parent_dir = try dest.makeOpenPath(dirname, .{});
-                    defer parent_dir.close();
+                    defer parent_dir.close(io);
                     const basename = std.fs.path.basename(filename);
                     break :blk try parent_dir.createFile(basename, .{ .exclusive = true });
                 }
                 break :blk try dest.createFile(filename, .{ .exclusive = true });
             };
-            defer out_file.close();
+            defer out_file.close(io);
             var out_file_buffer: [1024]u8 = undefined;
             var file_writer = out_file.writer(&out_file_buffer);
             const local_data_file_offset: u64 =

src/Compilation.zig+34-30

src/Package/Fetch.zig+38-34

...	@@ -513,7 +513,7 @@ fn runResource(	...	@@ -513,7 +513,7 @@ fn runResource(
513	break :handle dir;	513	break :handle dir;
514	},	514	},
515	};	515	};
516	defer tmp_directory.handle.close();	516	defer tmp_directory.handle.close(io);
517		517
518	// Fetch and unpack a resource into a temporary directory.	518	// Fetch and unpack a resource into a temporary directory.
519	var unpack_result = try unpackResource(f, resource, uri_path, tmp_directory);	519	var unpack_result = try unpackResource(f, resource, uri_path, tmp_directory);
...	@@ -523,7 +523,7 @@ fn runResource(	...	@@ -523,7 +523,7 @@ fn runResource(
523	// Apply btrfs workaround if needed. Reopen tmp_directory.	523	// Apply btrfs workaround if needed. Reopen tmp_directory.
524	if (native_os == .linux and f.job_queue.work_around_btrfs_bug) {	524	if (native_os == .linux and f.job_queue.work_around_btrfs_bug) {
525	// https://github.com/ziglang/zig/issues/17095	525	// https://github.com/ziglang/zig/issues/17095
526	pkg_path.root_dir.handle.close();	526	pkg_path.root_dir.handle.close(io);
527	pkg_path.root_dir.handle = cache_root.handle.makeOpenPath(tmp_dir_sub_path, .{	527	pkg_path.root_dir.handle = cache_root.handle.makeOpenPath(tmp_dir_sub_path, .{
528	.iterate = true,	528	.iterate = true,
529	}) catch @panic("btrfs workaround failed");	529	}) catch @panic("btrfs workaround failed");
...	@@ -885,7 +885,7 @@ const Resource = union(enum) {	...	@@ -885,7 +885,7 @@ const Resource = union(enum) {
885	file: fs.File.Reader,	885	file: fs.File.Reader,
886	http_request: HttpRequest,	886	http_request: HttpRequest,
887	git: Git,	887	git: Git,
888	dir: fs.Dir,	888	dir: Io.Dir,
889		889
890	const Git = struct {	890	const Git = struct {
891	session: git.Session,	891	session: git.Session,
...	@@ -908,7 +908,7 @@ const Resource = union(enum) {	...	@@ -908,7 +908,7 @@ const Resource = union(enum) {
908	.git => \|*git_resource\| {	908	.git => \|*git_resource\| {
909	git_resource.fetch_stream.deinit();	909	git_resource.fetch_stream.deinit();
910	},	910	},
911	.dir => \|*dir\| dir.close(),	911	.dir => \|*dir\| dir.close(io),
912	}	912	}
913	resource.* = undefined;	913	resource.* = undefined;
914	}	914	}
...	@@ -1247,13 +1247,14 @@ fn unpackResource(	...	@@ -1247,13 +1247,14 @@ fn unpackResource(
1247	}	1247	}
1248	}	1248	}
1249		1249
1250	fn unpackTarball(f: Fetch, out_dir: fs.Dir, reader: Io.Reader) RunError!UnpackResult {	1250	fn unpackTarball(f: Fetch, out_dir: Io.Dir, reader: Io.Reader) RunError!UnpackResult {
1251	const eb = &f.error_bundle;	1251	const eb = &f.error_bundle;
1252	const arena = f.arena.allocator();	1252	const arena = f.arena.allocator();
		1253	const io = f.job_queue.io;
1253		1254
1254	var diagnostics: std.tar.Diagnostics = .{ .allocator = arena };	1255	var diagnostics: std.tar.Diagnostics = .{ .allocator = arena };
1255		1256
1256	std.tar.pipeToFileSystem(out_dir, reader, .{	1257	std.tar.pipeToFileSystem(io, out_dir, reader, .{
1257	.diagnostics = &diagnostics,	1258	.diagnostics = &diagnostics,
1258	.strip_components = 0,	1259	.strip_components = 0,
1259	.mode_mode = .ignore,	1260	.mode_mode = .ignore,
...	@@ -1280,7 +1281,7 @@ fn unpackTarball(f: Fetch, out_dir: fs.Dir, reader: Io.Reader) RunError!Unpack	...	@@ -1280,7 +1281,7 @@ fn unpackTarball(f: Fetch, out_dir: fs.Dir, reader: Io.Reader) RunError!Unpack
1280		1281
1281	fn unzip(	1282	fn unzip(
1282	f: *Fetch,	1283	f: *Fetch,
1283	out_dir: fs.Dir,	1284	out_dir: Io.Dir,
1284	reader: *Io.Reader,	1285	reader: *Io.Reader,
1285	) error{ ReadFailed, OutOfMemory, Canceled, FetchFailed }!UnpackResult {	1286	) error{ ReadFailed, OutOfMemory, Canceled, FetchFailed }!UnpackResult {
1286	// We write the entire contents to a file first because zip files	1287	// We write the entire contents to a file first because zip files
...	@@ -1314,7 +1315,7 @@ fn unzip(	...	@@ -1314,7 +1315,7 @@ fn unzip(
1314	),	1315	),
1315	};	1316	};
1316	};	1317	};
1317	defer zip_file.close();	1318	defer zip_file.close(io);
1318	var zip_file_buffer: [4096]u8 = undefined;	1319	var zip_file_buffer: [4096]u8 = undefined;
1319	var zip_file_reader = b: {	1320	var zip_file_reader = b: {
1320	var zip_file_writer = zip_file.writer(&zip_file_buffer);	1321	var zip_file_writer = zip_file.writer(&zip_file_buffer);
...	@@ -1349,7 +1350,7 @@ fn unzip(	...	@@ -1349,7 +1350,7 @@ fn unzip(
1349	return .{ .root_dir = diagnostics.root_dir };	1350	return .{ .root_dir = diagnostics.root_dir };
1350	}	1351	}
1351		1352
1352	fn unpackGitPack(f: Fetch, out_dir: fs.Dir, resource: Resource.Git) anyerror!UnpackResult {	1353	fn unpackGitPack(f: Fetch, out_dir: Io.Dir, resource: Resource.Git) anyerror!UnpackResult {
1353	const io = f.job_queue.io;	1354	const io = f.job_queue.io;
1354	const arena = f.arena.allocator();	1355	const arena = f.arena.allocator();
1355	// TODO don't try to get a gpa from an arena. expose this dependency higher up	1356	// TODO don't try to get a gpa from an arena. expose this dependency higher up
...	@@ -1363,9 +1364,9 @@ fn unpackGitPack(f: Fetch, out_dir: fs.Dir, resource: Resource.Git) anyerror!U	...	@@ -1363,9 +1364,9 @@ fn unpackGitPack(f: Fetch, out_dir: fs.Dir, resource: Resource.Git) anyerror!U
1363	// directory, since that isn't relevant for fetching a package.	1364	// directory, since that isn't relevant for fetching a package.
1364	{	1365	{
1365	var pack_dir = try out_dir.makeOpenPath(".git", .{});	1366	var pack_dir = try out_dir.makeOpenPath(".git", .{});
1366	defer pack_dir.close();	1367	defer pack_dir.close(io);
1367	var pack_file = try pack_dir.createFile("pkg.pack", .{ .read = true });	1368	var pack_file = try pack_dir.createFile("pkg.pack", .{ .read = true });
1368	defer pack_file.close();	1369	defer pack_file.close(io);
1369	var pack_file_buffer: [4096]u8 = undefined;	1370	var pack_file_buffer: [4096]u8 = undefined;
1370	var pack_file_reader = b: {	1371	var pack_file_reader = b: {
1371	var pack_file_writer = pack_file.writer(&pack_file_buffer);	1372	var pack_file_writer = pack_file.writer(&pack_file_buffer);
...	@@ -1376,7 +1377,7 @@ fn unpackGitPack(f: Fetch, out_dir: fs.Dir, resource: Resource.Git) anyerror!U	...	@@ -1376,7 +1377,7 @@ fn unpackGitPack(f: Fetch, out_dir: fs.Dir, resource: Resource.Git) anyerror!U
1376	};	1377	};
1377		1378
1378	var index_file = try pack_dir.createFile("pkg.idx", .{ .read = true });	1379	var index_file = try pack_dir.createFile("pkg.idx", .{ .read = true });
1379	defer index_file.close();	1380	defer index_file.close(io);
1380	var index_file_buffer: [2000]u8 = undefined;	1381	var index_file_buffer: [2000]u8 = undefined;
1381	var index_file_writer = index_file.writer(&index_file_buffer);	1382	var index_file_writer = index_file.writer(&index_file_buffer);
1382	{	1383	{
...	@@ -1393,7 +1394,7 @@ fn unpackGitPack(f: Fetch, out_dir: fs.Dir, resource: Resource.Git) anyerror!U	...	@@ -1393,7 +1394,7 @@ fn unpackGitPack(f: Fetch, out_dir: fs.Dir, resource: Resource.Git) anyerror!U
1393	try repository.init(gpa, object_format, &pack_file_reader, &index_file_reader);	1394	try repository.init(gpa, object_format, &pack_file_reader, &index_file_reader);
1394	defer repository.deinit();	1395	defer repository.deinit();
1395	var diagnostics: git.Diagnostics = .{ .allocator = arena };	1396	var diagnostics: git.Diagnostics = .{ .allocator = arena };
1396	try repository.checkout(out_dir, resource.want_oid, &diagnostics);	1397	try repository.checkout(io, out_dir, resource.want_oid, &diagnostics);
1397		1398
1398	if (diagnostics.errors.items.len > 0) {	1399	if (diagnostics.errors.items.len > 0) {
1399	try res.allocErrors(arena, diagnostics.errors.items.len, "unable to unpack packfile");	1400	try res.allocErrors(arena, diagnostics.errors.items.len, "unable to unpack packfile");
...	@@ -1411,7 +1412,7 @@ fn unpackGitPack(f: Fetch, out_dir: fs.Dir, resource: Resource.Git) anyerror!U	...	@@ -1411,7 +1412,7 @@ fn unpackGitPack(f: Fetch, out_dir: fs.Dir, resource: Resource.Git) anyerror!U
1411	return res;	1412	return res;
1412	}	1413	}
1413		1414
1414	fn recursiveDirectoryCopy(f: *Fetch, dir: fs.Dir, tmp_dir: fs.Dir) anyerror!void {	1415	fn recursiveDirectoryCopy(f: *Fetch, dir: Io.Dir, tmp_dir: Io.Dir) anyerror!void {
1415	const gpa = f.arena.child_allocator;	1416	const gpa = f.arena.child_allocator;
1416	// Recursive directory copy.	1417	// Recursive directory copy.
1417	var it = try dir.walk(gpa);	1418	var it = try dir.walk(gpa);
...	@@ -1451,7 +1452,7 @@ fn recursiveDirectoryCopy(f: *Fetch, dir: fs.Dir, tmp_dir: fs.Dir) anyerror!void	...	@@ -1451,7 +1452,7 @@ fn recursiveDirectoryCopy(f: *Fetch, dir: fs.Dir, tmp_dir: fs.Dir) anyerror!void
1451	}	1452	}
1452	}	1453	}
1453		1454
1454	pub fn renameTmpIntoCache(cache_dir: fs.Dir, tmp_dir_sub_path: []const u8, dest_dir_sub_path: []const u8) !void {	1455	pub fn renameTmpIntoCache(cache_dir: Io.Dir, tmp_dir_sub_path: []const u8, dest_dir_sub_path: []const u8) !void {
1455	assert(dest_dir_sub_path[1] == fs.path.sep);	1456	assert(dest_dir_sub_path[1] == fs.path.sep);
1456	var handled_missing_dir = false;	1457	var handled_missing_dir = false;
1457	while (true) {	1458	while (true) {
...	@@ -1660,15 +1661,15 @@ fn dumpHashInfo(all_files: []const *const HashedFile) !void {	...	@@ -1660,15 +1661,15 @@ fn dumpHashInfo(all_files: []const *const HashedFile) !void {
1660	try w.flush();	1661	try w.flush();
1661	}	1662	}
1662		1663
1663	fn workerHashFile(dir: fs.Dir, hashed_file: *HashedFile) void {	1664	fn workerHashFile(dir: Io.Dir, hashed_file: *HashedFile) void {
1664	hashed_file.failure = hashFileFallible(dir, hashed_file);	1665	hashed_file.failure = hashFileFallible(dir, hashed_file);
1665	}	1666	}
1666		1667
1667	fn workerDeleteFile(dir: fs.Dir, deleted_file: *DeletedFile) void {	1668	fn workerDeleteFile(dir: Io.Dir, deleted_file: *DeletedFile) void {
1668	deleted_file.failure = deleteFileFallible(dir, deleted_file);	1669	deleted_file.failure = deleteFileFallible(dir, deleted_file);
1669	}	1670	}
1670		1671
1671	fn hashFileFallible(dir: fs.Dir, hashed_file: *HashedFile) HashedFile.Error!void {	1672	fn hashFileFallible(io: Io, dir: Io.Dir, hashed_file: *HashedFile) HashedFile.Error!void {
1672	var buf: [8000]u8 = undefined;	1673	var buf: [8000]u8 = undefined;
1673	var hasher = Package.Hash.Algo.init(.{});	1674	var hasher = Package.Hash.Algo.init(.{});
1674	hasher.update(hashed_file.normalized_path);	1675	hasher.update(hashed_file.normalized_path);
...	@@ -1677,7 +1678,7 @@ fn hashFileFallible(dir: fs.Dir, hashed_file: *HashedFile) HashedFile.Error!void	...	@@ -1677,7 +1678,7 @@ fn hashFileFallible(dir: fs.Dir, hashed_file: *HashedFile) HashedFile.Error!void
1677	switch (hashed_file.kind) {	1678	switch (hashed_file.kind) {
1678	.file => {	1679	.file => {
1679	var file = try dir.openFile(hashed_file.fs_path, .{});	1680	var file = try dir.openFile(hashed_file.fs_path, .{});
1680	defer file.close();	1681	defer file.close(io);
1681	// Hard-coded false executable bit: https://github.com/ziglang/zig/issues/17463	1682	// Hard-coded false executable bit: https://github.com/ziglang/zig/issues/17463
1682	hasher.update(&.{ 0, 0 });	1683	hasher.update(&.{ 0, 0 });
1683	var file_header: FileHeader = .{};	1684	var file_header: FileHeader = .{};
...	@@ -1707,7 +1708,7 @@ fn hashFileFallible(dir: fs.Dir, hashed_file: *HashedFile) HashedFile.Error!void	...	@@ -1707,7 +1708,7 @@ fn hashFileFallible(dir: fs.Dir, hashed_file: *HashedFile) HashedFile.Error!void
1707	hashed_file.size = file_size;	1708	hashed_file.size = file_size;
1708	}	1709	}
1709		1710
1710	fn deleteFileFallible(dir: fs.Dir, deleted_file: *DeletedFile) DeletedFile.Error!void {	1711	fn deleteFileFallible(dir: Io.Dir, deleted_file: *DeletedFile) DeletedFile.Error!void {
1711	try dir.deleteFile(deleted_file.fs_path);	1712	try dir.deleteFile(deleted_file.fs_path);
1712	}	1713	}
1713		1714
...	@@ -1724,8 +1725,8 @@ const DeletedFile = struct {	...	@@ -1724,8 +1725,8 @@ const DeletedFile = struct {
1724	failure: Error!void,	1725	failure: Error!void,
1725		1726
1726	const Error =	1727	const Error =
1727	fs.Dir.DeleteFileError \|\|	1728	Io.Dir.DeleteFileError \|\|
1728	fs.Dir.DeleteDirError;	1729	Io.Dir.DeleteDirError;
1729	};	1730	};
1730		1731
1731	const HashedFile = struct {	1732	const HashedFile = struct {
...	@@ -1741,7 +1742,7 @@ const HashedFile = struct {	...	@@ -1741,7 +1742,7 @@ const HashedFile = struct {
1741	fs.File.ReadError \|\|	1742	fs.File.ReadError \|\|
1742	fs.File.StatError \|\|	1743	fs.File.StatError \|\|
1743	fs.File.ChmodError \|\|	1744	fs.File.ChmodError \|\|
1744	fs.Dir.ReadLinkError;	1745	Io.Dir.ReadLinkError;
1745		1746
1746	const Kind = enum { file, link };	1747	const Kind = enum { file, link };
1747		1748
...	@@ -2074,7 +2075,7 @@ test "tarball with duplicate paths" {	...	@@ -2074,7 +2075,7 @@ test "tarball with duplicate paths" {
2074	defer tmp.cleanup();	2075	defer tmp.cleanup();
2075		2076
2076	const tarball_name = "duplicate_paths.tar.gz";	2077	const tarball_name = "duplicate_paths.tar.gz";
2077	try saveEmbedFile(tarball_name, tmp.dir);	2078	try saveEmbedFile(io, tarball_name, tmp.dir);
2078	const tarball_path = try std.fmt.allocPrint(gpa, ".zig-cache/tmp/{s}/{s}", .{ tmp.sub_path, tarball_name });	2079	const tarball_path = try std.fmt.allocPrint(gpa, ".zig-cache/tmp/{s}/{s}", .{ tmp.sub_path, tarball_name });
2079	defer gpa.free(tarball_path);	2080	defer gpa.free(tarball_path);
2080		2081
...	@@ -2107,7 +2108,7 @@ test "tarball with excluded duplicate paths" {	...	@@ -2107,7 +2108,7 @@ test "tarball with excluded duplicate paths" {
2107	defer tmp.cleanup();	2108	defer tmp.cleanup();
2108		2109
2109	const tarball_name = "duplicate_paths_excluded.tar.gz";	2110	const tarball_name = "duplicate_paths_excluded.tar.gz";
2110	try saveEmbedFile(tarball_name, tmp.dir);	2111	try saveEmbedFile(io, tarball_name, tmp.dir);
2111	const tarball_path = try std.fmt.allocPrint(gpa, ".zig-cache/tmp/{s}/{s}", .{ tmp.sub_path, tarball_name });	2112	const tarball_path = try std.fmt.allocPrint(gpa, ".zig-cache/tmp/{s}/{s}", .{ tmp.sub_path, tarball_name });
2112	defer gpa.free(tarball_path);	2113	defer gpa.free(tarball_path);
2113		2114
...	@@ -2153,7 +2154,7 @@ test "tarball without root folder" {	...	@@ -2153,7 +2154,7 @@ test "tarball without root folder" {
2153	defer tmp.cleanup();	2154	defer tmp.cleanup();
2154		2155
2155	const tarball_name = "no_root.tar.gz";	2156	const tarball_name = "no_root.tar.gz";
2156	try saveEmbedFile(tarball_name, tmp.dir);	2157	try saveEmbedFile(io, tarball_name, tmp.dir);
2157	const tarball_path = try std.fmt.allocPrint(gpa, ".zig-cache/tmp/{s}/{s}", .{ tmp.sub_path, tarball_name });	2158	const tarball_path = try std.fmt.allocPrint(gpa, ".zig-cache/tmp/{s}/{s}", .{ tmp.sub_path, tarball_name });
2158	defer gpa.free(tarball_path);	2159	defer gpa.free(tarball_path);
2159		2160
...	@@ -2186,7 +2187,7 @@ test "set executable bit based on file content" {	...	@@ -2186,7 +2187,7 @@ test "set executable bit based on file content" {
2186	defer tmp.cleanup();	2187	defer tmp.cleanup();
2187		2188
2188	const tarball_name = "executables.tar.gz";	2189	const tarball_name = "executables.tar.gz";
2189	try saveEmbedFile(tarball_name, tmp.dir);	2190	try saveEmbedFile(io, tarball_name, tmp.dir);
2190	const tarball_path = try std.fmt.allocPrint(gpa, ".zig-cache/tmp/{s}/{s}", .{ tmp.sub_path, tarball_name });	2191	const tarball_path = try std.fmt.allocPrint(gpa, ".zig-cache/tmp/{s}/{s}", .{ tmp.sub_path, tarball_name });
2191	defer gpa.free(tarball_path);	2192	defer gpa.free(tarball_path);
2192		2193
...	@@ -2210,7 +2211,7 @@ test "set executable bit based on file content" {	...	@@ -2210,7 +2211,7 @@ test "set executable bit based on file content" {
2210	);	2211	);
2211		2212
2212	var out = try fb.packageDir();	2213	var out = try fb.packageDir();
2213	defer out.close();	2214	defer out.close(io);
2214	const S = std.posix.S;	2215	const S = std.posix.S;
2215	// expect executable bit not set	2216	// expect executable bit not set
2216	try std.testing.expect((try out.statFile("file1")).mode & S.IXUSR == 0);	2217	try std.testing.expect((try out.statFile("file1")).mode & S.IXUSR == 0);
...	@@ -2231,11 +2232,11 @@ test "set executable bit based on file content" {	...	@@ -2231,11 +2232,11 @@ test "set executable bit based on file content" {
2231	// -rwxrwxr-x 1 17 Apr script_with_shebang_without_exec_bit	2232	// -rwxrwxr-x 1 17 Apr script_with_shebang_without_exec_bit
2232	}	2233	}
2233		2234
2234	fn saveEmbedFile(comptime tarball_name: []const u8, dir: fs.Dir) !void {	2235	fn saveEmbedFile(io: Io, comptime tarball_name: []const u8, dir: Io.Dir) !void {
2235	//const tarball_name = "duplicate_paths_excluded.tar.gz";	2236	//const tarball_name = "duplicate_paths_excluded.tar.gz";
2236	const tarball_content = @embedFile("Fetch/testdata/" ++ tarball_name);	2237	const tarball_content = @embedFile("Fetch/testdata/" ++ tarball_name);
2237	var tmp_file = try dir.createFile(tarball_name, .{});	2238	var tmp_file = try dir.createFile(tarball_name, .{});
2238	defer tmp_file.close();	2239	defer tmp_file.close(io);
2239	try tmp_file.writeAll(tarball_content);	2240	try tmp_file.writeAll(tarball_content);
2240	}	2241	}
2241		2242
...	@@ -2250,7 +2251,7 @@ const TestFetchBuilder = struct {	...	@@ -2250,7 +2251,7 @@ const TestFetchBuilder = struct {
2250	self: *TestFetchBuilder,	2251	self: *TestFetchBuilder,
2251	allocator: std.mem.Allocator,	2252	allocator: std.mem.Allocator,
2252	io: Io,	2253	io: Io,
2253	cache_parent_dir: std.fs.Dir,	2254	cache_parent_dir: std.Io.Dir,
2254	path_or_url: []const u8,	2255	path_or_url: []const u8,
2255	) !*Fetch {	2256	) !*Fetch {
2256	const cache_dir = try cache_parent_dir.makeOpenPath("zig-global-cache", .{});	2257	const cache_dir = try cache_parent_dir.makeOpenPath("zig-global-cache", .{});
...	@@ -2301,14 +2302,15 @@ const TestFetchBuilder = struct {	...	@@ -2301,14 +2302,15 @@ const TestFetchBuilder = struct {
2301	}	2302	}
2302		2303
2303	fn deinit(self: *TestFetchBuilder) void {	2304	fn deinit(self: *TestFetchBuilder) void {
		2305	const io = self.job_queue.io;
2304	self.fetch.deinit();	2306	self.fetch.deinit();
2305	self.job_queue.deinit();	2307	self.job_queue.deinit();
2306	self.fetch.prog_node.end();	2308	self.fetch.prog_node.end();
2307	self.global_cache_directory.handle.close();	2309	self.global_cache_directory.handle.close(io);
2308	self.http_client.deinit();	2310	self.http_client.deinit();
2309	}	2311	}
2310		2312
2311	fn packageDir(self: *TestFetchBuilder) !fs.Dir {	2313	fn packageDir(self: *TestFetchBuilder) !Io.Dir {
2312	const root = self.fetch.package_root;	2314	const root = self.fetch.package_root;
2313	return try root.root_dir.handle.openDir(root.sub_path, .{ .iterate = true });	2315	return try root.root_dir.handle.openDir(root.sub_path, .{ .iterate = true });
2314	}	2316	}
...	@@ -2316,8 +2318,10 @@ const TestFetchBuilder = struct {	...	@@ -2316,8 +2318,10 @@ const TestFetchBuilder = struct {
2316	// Test helper, asserts thet package dir constains expected_files.	2318	// Test helper, asserts thet package dir constains expected_files.
2317	// expected_files must be sorted.	2319	// expected_files must be sorted.
2318	fn expectPackageFiles(self: *TestFetchBuilder, expected_files: []const []const u8) !void {	2320	fn expectPackageFiles(self: *TestFetchBuilder, expected_files: []const []const u8) !void {
		2321	const io = self.job_queue.io;
		2322
2319	var package_dir = try self.packageDir();	2323	var package_dir = try self.packageDir();
2320	defer package_dir.close();	2324	defer package_dir.close(io);
2321		2325
2322	var actual_files: std.ArrayList([]u8) = .empty;	2326	var actual_files: std.ArrayList([]u8) = .empty;
2323	defer actual_files.deinit(std.testing.allocator);	2327	defer actual_files.deinit(std.testing.allocator);

src/Package/Fetch/git.zig+14-12

 @@ -213,6 +213,7 @@ pub const Repository = struct {
     /// Checks out the repository at `commit_oid` to `worktree`.
     pub fn checkout(
         repository: *Repository,
+        io: Io,
         worktree: std.fs.Dir,
         commit_oid: Oid,
         diagnostics: *Diagnostics,
 @@ -223,12 +224,13 @@ pub const Repository = struct {
             if (commit_object.type != .commit) return error.NotACommit;
             break :tree_oid try getCommitTree(repository.odb.format, commit_object.data);
         };
-        try repository.checkoutTree(worktree, tree_oid, "", diagnostics);
+        try repository.checkoutTree(io, worktree, tree_oid, "", diagnostics);
     }
     /// Checks out the tree at `tree_oid` to `worktree`.
     fn checkoutTree(
         repository: *Repository,
+        io: Io,
         dir: std.fs.Dir,
         tree_oid: Oid,
         current_path: []const u8,
 @@ -253,10 +255,10 @@ pub const Repository = struct {
                 .directory => {
                     try dir.makeDir(entry.name);
                     var subdir = try dir.openDir(entry.name, .{});
-                    defer subdir.close();
+                    defer subdir.close(io);
                     const sub_path = try std.fs.path.join(repository.odb.allocator, &.{ current_path, entry.name });
                     defer repository.odb.allocator.free(sub_path);
-                    try repository.checkoutTree(subdir, entry.oid, sub_path, diagnostics);
+                    try repository.checkoutTree(io, subdir, entry.oid, sub_path, diagnostics);
                 },
                 .file => {
                     try repository.odb.seekOid(entry.oid);
 @@ -271,7 +273,7 @@ pub const Repository = struct {
                         } });
                         continue;
                     };
-                    defer file.close();
+                    defer file.close(io);
                     try file.writeAll(file_object.data);
                 },
                 .symlink => {
 @@ -1583,14 +1585,14 @@ fn runRepositoryTest(io: Io, comptime format: Oid.Format, head_commit: []const u
     var git_dir = testing.tmpDir(.{});
     defer git_dir.cleanup();
     var pack_file = try git_dir.dir.createFile("testrepo.pack", .{ .read = true });
-    defer pack_file.close();
+    defer pack_file.close(io);
     try pack_file.writeAll(testrepo_pack);
     var pack_file_buffer: [2000]u8 = undefined;
     var pack_file_reader = pack_file.reader(io, &pack_file_buffer);
     var index_file = try git_dir.dir.createFile("testrepo.idx", .{ .read = true });
-    defer index_file.close();
+    defer index_file.close(io);
     var index_file_buffer: [2000]u8 = undefined;
     var index_file_writer = index_file.writer(&index_file_buffer);
     try indexPack(testing.allocator, format, &pack_file_reader, &index_file_writer);
 @@ -1621,7 +1623,7 @@ fn runRepositoryTest(io: Io, comptime format: Oid.Format, head_commit: []const u
     var diagnostics: Diagnostics = .{ .allocator = testing.allocator };
     defer diagnostics.deinit();
-    try repository.checkout(worktree.dir, commit_id, &diagnostics);
+    try repository.checkout(io, worktree.dir, commit_id, &diagnostics);
     try testing.expect(diagnostics.errors.items.len == 0);
     const expected_files: []const []const u8 = &.{
 @@ -1713,20 +1715,20 @@ pub fn main() !void {
     const format = std.meta.stringToEnum(Oid.Format, args[1]) orelse return error.InvalidFormat;
     var pack_file = try std.fs.cwd().openFile(args[2], .{});
-    defer pack_file.close();
+    defer pack_file.close(io);
     var pack_file_buffer: [4096]u8 = undefined;
     var pack_file_reader = pack_file.reader(io, &pack_file_buffer);
     const commit = try Oid.parse(format, args[3]);
     var worktree = try std.fs.cwd().makeOpenPath(args[4], .{});
-    defer worktree.close();
+    defer worktree.close(io);
     var git_dir = try worktree.makeOpenPath(".git", .{});
-    defer git_dir.close();
+    defer git_dir.close(io);
     std.debug.print("Starting index...\n", .{});
     var index_file = try git_dir.createFile("idx", .{ .read = true });
-    defer index_file.close();
+    defer index_file.close(io);
     var index_file_buffer: [4096]u8 = undefined;
     var index_file_writer = index_file.writer(&index_file_buffer);
     try indexPack(allocator, format, &pack_file_reader, &index_file_writer);
 @@ -1738,7 +1740,7 @@ pub fn main() !void {
     defer repository.deinit();
     var diagnostics: Diagnostics = .{ .allocator = allocator };
     defer diagnostics.deinit();
-    try repository.checkout(worktree, commit, &diagnostics);
+    try repository.checkout(io, worktree, commit, &diagnostics);
     for (diagnostics.errors.items) |err| {
         std.debug.print("Diagnostic: {}\n", .{err});

src/Zcu.zig+5-5

...	@@ -1078,7 +1078,7 @@ pub const File = struct {	...	@@ -1078,7 +1078,7 @@ pub const File = struct {
1078	const dir, const sub_path = file.path.openInfo(zcu.comp.dirs);	1078	const dir, const sub_path = file.path.openInfo(zcu.comp.dirs);
1079	break :f try dir.openFile(sub_path, .{});	1079	break :f try dir.openFile(sub_path, .{});
1080	};	1080	};
1081	defer f.close();	1081	defer f.close(io);
1082		1082
1083	const stat = f.stat() catch \|err\| switch (err) {	1083	const stat = f.stat() catch \|err\| switch (err) {
1084	error.Streaming => {	1084	error.Streaming => {
...	@@ -2813,8 +2813,8 @@ pub fn init(zcu: *Zcu, gpa: Allocator, io: Io, thread_count: usize) !void {	...	@@ -2813,8 +2813,8 @@ pub fn init(zcu: *Zcu, gpa: Allocator, io: Io, thread_count: usize) !void {
2813		2813
2814	pub fn deinit(zcu: *Zcu) void {	2814	pub fn deinit(zcu: *Zcu) void {
2815	const comp = zcu.comp;	2815	const comp = zcu.comp;
2816	const gpa = comp.gpa;
2817	const io = comp.io;	2816	const io = comp.io;
		2817	const gpa = zcu.gpa;
2818	{	2818	{
2819	const pt: Zcu.PerThread = .activate(zcu, .main);	2819	const pt: Zcu.PerThread = .activate(zcu, .main);
2820	defer pt.deactivate();	2820	defer pt.deactivate();
...	@@ -2835,8 +2835,8 @@ pub fn deinit(zcu: *Zcu) void {	...	@@ -2835,8 +2835,8 @@ pub fn deinit(zcu: *Zcu) void {
2835	}	2835	}
2836	zcu.embed_table.deinit(gpa);	2836	zcu.embed_table.deinit(gpa);
2837		2837
2838	zcu.local_zir_cache.handle.close();	2838	zcu.local_zir_cache.handle.close(io);
2839	zcu.global_zir_cache.handle.close();	2839	zcu.global_zir_cache.handle.close(io);
2840		2840
2841	for (zcu.failed_analysis.values()) \|value\| value.destroy(gpa);	2841	for (zcu.failed_analysis.values()) \|value\| value.destroy(gpa);
2842	for (zcu.failed_codegen.values()) \|value\| value.destroy(gpa);	2842	for (zcu.failed_codegen.values()) \|value\| value.destroy(gpa);
...	@@ -2900,7 +2900,7 @@ pub fn deinit(zcu: *Zcu) void {	...	@@ -2900,7 +2900,7 @@ pub fn deinit(zcu: *Zcu) void {
2900		2900
2901	if (zcu.resolved_references) \|*r\| r.deinit(gpa);	2901	if (zcu.resolved_references) \|*r\| r.deinit(gpa);
2902		2902
2903	if (zcu.comp.debugIncremental()) {	2903	if (comp.debugIncremental()) {
2904	zcu.incremental_debug_state.deinit(gpa);	2904	zcu.incremental_debug_state.deinit(gpa);
2905	}	2905	}
2906	}	2906	}

src/Zcu/PerThread.zig+3-3

src/codegen/llvm.zig+3-2

src/fmt.zig+6-4

...	@@ -187,7 +187,7 @@ pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !	...	@@ -187,7 +187,7 @@ pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !
187	// On Windows, statFile does not work for directories	187	// On Windows, statFile does not work for directories
188	error.IsDir => dir: {	188	error.IsDir => dir: {
189	var dir = try fs.cwd().openDir(file_path, .{});	189	var dir = try fs.cwd().openDir(file_path, .{});
190	defer dir.close();	190	defer dir.close(io);
191	break :dir try dir.stat();	191	break :dir try dir.stat();
192	},	192	},
193	else => \|e\| return e,	193	else => \|e\| return e,
...	@@ -222,8 +222,10 @@ fn fmtPathDir(	...	@@ -222,8 +222,10 @@ fn fmtPathDir(
222	parent_dir: fs.Dir,	222	parent_dir: fs.Dir,
223	parent_sub_path: []const u8,	223	parent_sub_path: []const u8,
224	) !void {	224	) !void {
		225	const io = fmt.io;
		226
225	var dir = try parent_dir.openDir(parent_sub_path, .{ .iterate = true });	227	var dir = try parent_dir.openDir(parent_sub_path, .{ .iterate = true });
226	defer dir.close();	228	defer dir.close(io);
227		229
228	const stat = try dir.stat();	230	const stat = try dir.stat();
229	if (try fmt.seen.fetchPut(stat.inode, {})) \|_\| return;	231	if (try fmt.seen.fetchPut(stat.inode, {})) \|_\| return;
...	@@ -262,7 +264,7 @@ fn fmtPathFile(	...	@@ -262,7 +264,7 @@ fn fmtPathFile(
262		264
263	const source_file = try dir.openFile(sub_path, .{});	265	const source_file = try dir.openFile(sub_path, .{});
264	var file_closed = false;	266	var file_closed = false;
265	errdefer if (!file_closed) source_file.close();	267	errdefer if (!file_closed) source_file.close(io);
266		268
267	const stat = try source_file.stat();	269	const stat = try source_file.stat();
268		270
...	@@ -280,7 +282,7 @@ fn fmtPathFile(	...	@@ -280,7 +282,7 @@ fn fmtPathFile(
280	};	282	};
281	defer gpa.free(source_code);	283	defer gpa.free(source_code);
282		284
283	source_file.close();	285	source_file.close(io);
284	file_closed = true;	286	file_closed = true;
285		287
286	// Add to set after no longer possible to get error.IsDir.	288	// Add to set after no longer possible to get error.IsDir.

src/introspect.zig+16-12

 @@ -1,18 +1,21 @@
-const std = @import("std");
 const builtin = @import("builtin");
+const build_options = @import("build_options");
+const std = @import("std");
+const Io = std.Io;
 const mem = std.mem;
-const Allocator = mem.Allocator;
+const Allocator = std.mem.Allocator;
 const os = std.os;
 const fs = std.fs;
 const Cache = std.Build.Cache;
 const Compilation = @import("Compilation.zig");
 const Package = @import("Package.zig");
-const build_options = @import("build_options");
 /// Returns the sub_path that worked, or `null` if none did.
 /// The path of the returned Directory is relative to `base`.
 /// The handle of the returned Directory is open.
-fn testZigInstallPrefix(base_dir: fs.Dir) ?Cache.Directory {
+fn testZigInstallPrefix(io: Io, base_dir: Io.Dir) ?Cache.Directory {
     const test_index_file = "std" ++ fs.path.sep_str ++ "std.zig";
     zig_dir: {
 @@ -20,31 +23,31 @@ fn testZigInstallPrefix(base_dir: fs.Dir) ?Cache.Directory {
         const lib_zig = "lib" ++ fs.path.sep_str ++ "zig";
         var test_zig_dir = base_dir.openDir(lib_zig, .{}) catch break :zig_dir;
         const file = test_zig_dir.openFile(test_index_file, .{}) catch {
-            test_zig_dir.close();
+            test_zig_dir.close(io);
             break :zig_dir;
         };
-        file.close();
+        file.close(io);
         return .{ .handle = test_zig_dir, .path = lib_zig };
     }
     // Try lib/std/std.zig
     var test_zig_dir = base_dir.openDir("lib", .{}) catch return null;
     const file = test_zig_dir.openFile(test_index_file, .{}) catch {
-        test_zig_dir.close();
+        test_zig_dir.close(io);
         return null;
     };
-    file.close();
+    file.close(io);
     return .{ .handle = test_zig_dir, .path = "lib" };
 }
 /// Both the directory handle and the path are newly allocated resources which the caller now owns.
-pub fn findZigLibDir(gpa: Allocator) !Cache.Directory {
+pub fn findZigLibDir(gpa: Allocator, io: Io) !Cache.Directory {
     const cwd_path = try getResolvedCwd(gpa);
     defer gpa.free(cwd_path);
     const self_exe_path = try fs.selfExePathAlloc(gpa);
     defer gpa.free(self_exe_path);
-    return findZigLibDirFromSelfExe(gpa, cwd_path, self_exe_path);
+    return findZigLibDirFromSelfExe(gpa, io, cwd_path, self_exe_path);
 }
 /// Like `std.process.getCwdAlloc`, but also resolves the path with `std.fs.path.resolve`. This
 @@ -73,6 +76,7 @@ pub fn getResolvedCwd(gpa: Allocator) error{
 /// Both the directory handle and the path are newly allocated resources which the caller now owns.
 pub fn findZigLibDirFromSelfExe(
     allocator: Allocator,
+    io: Io,
     /// The return value of `getResolvedCwd`.
     /// Passed as an argument to avoid pointlessly repeating the call.
     cwd_path: []const u8,
 @@ -82,9 +86,9 @@ pub fn findZigLibDirFromSelfExe(
     var cur_path: []const u8 = self_exe_path;
     while (fs.path.dirname(cur_path)) |dirname| : (cur_path = dirname) {
         var base_dir = cwd.openDir(dirname, .{}) catch continue;
-        defer base_dir.close();
+        defer base_dir.close(io);
-        const sub_directory = testZigInstallPrefix(base_dir) orelse continue;
+        const sub_directory = testZigInstallPrefix(io, base_dir) orelse continue;
         const p = try fs.path.join(allocator, &.{ dirname, sub_directory.path.? });
         defer allocator.free(p);

src/libs/freebsd.zig+2-2

...	@@ -449,7 +449,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye	...	@@ -449,7 +449,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
449	cache.addPrefix(.{ .path = null, .handle = fs.cwd() });	449	cache.addPrefix(.{ .path = null, .handle = fs.cwd() });
450	cache.addPrefix(comp.dirs.zig_lib);	450	cache.addPrefix(comp.dirs.zig_lib);
451	cache.addPrefix(comp.dirs.global_cache);	451	cache.addPrefix(comp.dirs.global_cache);
452	defer cache.manifest_dir.close();	452	defer cache.manifest_dir.close(io);
453		453
454	var man = cache.obtain();	454	var man = cache.obtain();
455	defer man.deinit();	455	defer man.deinit();
...	@@ -480,7 +480,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye	...	@@ -480,7 +480,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
480	.handle = try comp.dirs.global_cache.handle.makeOpenPath(o_sub_path, .{}),	480	.handle = try comp.dirs.global_cache.handle.makeOpenPath(o_sub_path, .{}),
481	.path = try comp.dirs.global_cache.join(arena, &.{o_sub_path}),	481	.path = try comp.dirs.global_cache.join(arena, &.{o_sub_path}),
482	};	482	};
483	defer o_directory.handle.close();	483	defer o_directory.handle.close(io);
484		484
485	const abilists_contents = man.files.keys()[abilists_index].contents.?;	485	const abilists_contents = man.files.keys()[abilists_index].contents.?;
486	const metadata = try loadMetaData(gpa, abilists_contents);	486	const metadata = try loadMetaData(gpa, abilists_contents);

src/libs/glibc.zig+2-2

...	@@ -684,7 +684,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye	...	@@ -684,7 +684,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
684	cache.addPrefix(.{ .path = null, .handle = fs.cwd() });	684	cache.addPrefix(.{ .path = null, .handle = fs.cwd() });
685	cache.addPrefix(comp.dirs.zig_lib);	685	cache.addPrefix(comp.dirs.zig_lib);
686	cache.addPrefix(comp.dirs.global_cache);	686	cache.addPrefix(comp.dirs.global_cache);
687	defer cache.manifest_dir.close();	687	defer cache.manifest_dir.close(io);
688		688
689	var man = cache.obtain();	689	var man = cache.obtain();
690	defer man.deinit();	690	defer man.deinit();
...	@@ -715,7 +715,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye	...	@@ -715,7 +715,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
715	.handle = try comp.dirs.global_cache.handle.makeOpenPath(o_sub_path, .{}),	715	.handle = try comp.dirs.global_cache.handle.makeOpenPath(o_sub_path, .{}),
716	.path = try comp.dirs.global_cache.join(arena, &.{o_sub_path}),	716	.path = try comp.dirs.global_cache.join(arena, &.{o_sub_path}),
717	};	717	};
718	defer o_directory.handle.close();	718	defer o_directory.handle.close(io);
719		719
720	const abilists_contents = man.files.keys()[abilists_index].contents.?;	720	const abilists_contents = man.files.keys()[abilists_index].contents.?;
721	const metadata = try loadMetaData(gpa, abilists_contents);	721	const metadata = try loadMetaData(gpa, abilists_contents);

src/libs/mingw.zig+3-3

src/libs/netbsd.zig+2-2

...	@@ -390,7 +390,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye	...	@@ -390,7 +390,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
390	cache.addPrefix(.{ .path = null, .handle = fs.cwd() });	390	cache.addPrefix(.{ .path = null, .handle = fs.cwd() });
391	cache.addPrefix(comp.dirs.zig_lib);	391	cache.addPrefix(comp.dirs.zig_lib);
392	cache.addPrefix(comp.dirs.global_cache);	392	cache.addPrefix(comp.dirs.global_cache);
393	defer cache.manifest_dir.close();	393	defer cache.manifest_dir.close(io);
394		394
395	var man = cache.obtain();	395	var man = cache.obtain();
396	defer man.deinit();	396	defer man.deinit();
...	@@ -421,7 +421,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye	...	@@ -421,7 +421,7 @@ pub fn buildSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) anye
421	.handle = try comp.dirs.global_cache.handle.makeOpenPath(o_sub_path, .{}),	421	.handle = try comp.dirs.global_cache.handle.makeOpenPath(o_sub_path, .{}),
422	.path = try comp.dirs.global_cache.join(arena, &.{o_sub_path}),	422	.path = try comp.dirs.global_cache.join(arena, &.{o_sub_path}),
423	};	423	};
424	defer o_directory.handle.close();	424	defer o_directory.handle.close(io);
425		425
426	const abilists_contents = man.files.keys()[abilists_index].contents.?;	426	const abilists_contents = man.files.keys()[abilists_index].contents.?;
427	const metadata = try loadMetaData(gpa, abilists_contents);	427	const metadata = try loadMetaData(gpa, abilists_contents);

src/link.zig+49-34

...	@@ -687,7 +687,7 @@ pub const File = struct {	...	@@ -687,7 +687,7 @@ pub const File = struct {
687	.lld => assert(base.file == null),	687	.lld => assert(base.file == null),
688	.elf => if (base.file) \|f\| {	688	.elf => if (base.file) \|f\| {
689	dev.check(.elf_linker);	689	dev.check(.elf_linker);
690	f.close();	690	f.close(io);
691	base.file = null;	691	base.file = null;
692		692
693	if (base.child_pid) \|pid\| {	693	if (base.child_pid) \|pid\| {
...	@@ -701,7 +701,7 @@ pub const File = struct {	...	@@ -701,7 +701,7 @@ pub const File = struct {
701	},	701	},
702	.macho, .wasm => if (base.file) \|f\| {	702	.macho, .wasm => if (base.file) \|f\| {
703	dev.checkAny(&.{ .coff_linker, .macho_linker, .plan9_linker, .wasm_linker });	703	dev.checkAny(&.{ .coff_linker, .macho_linker, .plan9_linker, .wasm_linker });
704	f.close();	704	f.close(io);
705	base.file = null;	705	base.file = null;
706		706
707	if (base.child_pid) \|pid\| {	707	if (base.child_pid) \|pid\| {
...	@@ -866,8 +866,9 @@ pub const File = struct {	...	@@ -866,8 +866,9 @@ pub const File = struct {
866	}	866	}
867		867
868	pub fn destroy(base: *File) void {	868	pub fn destroy(base: *File) void {
		869	const io = base.comp.io;
869	base.releaseLock();	870	base.releaseLock();
870	if (base.file) \|f\| f.close();	871	if (base.file) \|f\| f.close(io);
871	switch (base.tag) {	872	switch (base.tag) {
872	.plan9 => unreachable,	873	.plan9 => unreachable,
873	inline else => \|tag\| {	874	inline else => \|tag\| {
...	@@ -1060,9 +1061,10 @@ pub const File = struct {	...	@@ -1060,9 +1061,10 @@ pub const File = struct {
1060	/// Opens a path as an object file and parses it into the linker.	1061	/// Opens a path as an object file and parses it into the linker.
1061	fn openLoadObject(base: *File, path: Path) anyerror!void {	1062	fn openLoadObject(base: *File, path: Path) anyerror!void {
1062	if (base.tag == .lld) return;	1063	if (base.tag == .lld) return;
		1064	const io = base.comp.io;
1063	const diags = &base.comp.link_diags;	1065	const diags = &base.comp.link_diags;
1064	const input = try openObjectInput(diags, path);	1066	const input = try openObjectInput(io, diags, path);
1065	errdefer input.object.file.close();	1067	errdefer input.object.file.close(io);
1066	try loadInput(base, input);	1068	try loadInput(base, input);
1067	}	1069	}
1068		1070
...	@@ -1070,21 +1072,22 @@ pub const File = struct {	...	@@ -1070,21 +1072,22 @@ pub const File = struct {
1070	/// If `query` is non-null, allows GNU ld scripts.	1072	/// If `query` is non-null, allows GNU ld scripts.
1071	fn openLoadArchive(base: *File, path: Path, opt_query: ?UnresolvedInput.Query) anyerror!void {	1073	fn openLoadArchive(base: *File, path: Path, opt_query: ?UnresolvedInput.Query) anyerror!void {
1072	if (base.tag == .lld) return;	1074	if (base.tag == .lld) return;
		1075	const io = base.comp.io;
1073	if (opt_query) \|query\| {	1076	if (opt_query) \|query\| {
1074	const archive = try openObject(path, query.must_link, query.hidden);	1077	const archive = try openObject(io, path, query.must_link, query.hidden);
1075	errdefer archive.file.close();	1078	errdefer archive.file.close(io);
1076	loadInput(base, .{ .archive = archive }) catch \|err\| switch (err) {	1079	loadInput(base, .{ .archive = archive }) catch \|err\| switch (err) {
1077	error.BadMagic, error.UnexpectedEndOfFile => {	1080	error.BadMagic, error.UnexpectedEndOfFile => {
1078	if (base.tag != .elf and base.tag != .elf2) return err;	1081	if (base.tag != .elf and base.tag != .elf2) return err;
1079	try loadGnuLdScript(base, path, query, archive.file);	1082	try loadGnuLdScript(base, path, query, archive.file);
1080	archive.file.close();	1083	archive.file.close(io);
1081	return;	1084	return;
1082	},	1085	},
1083	else => return err,	1086	else => return err,
1084	};	1087	};
1085	} else {	1088	} else {
1086	const archive = try openObject(path, false, false);	1089	const archive = try openObject(io, path, false, false);
1087	errdefer archive.file.close();	1090	errdefer archive.file.close(io);
1088	try loadInput(base, .{ .archive = archive });	1091	try loadInput(base, .{ .archive = archive });
1089	}	1092	}
1090	}	1093	}
...	@@ -1093,13 +1096,14 @@ pub const File = struct {	...	@@ -1093,13 +1096,14 @@ pub const File = struct {
1093	/// Handles GNU ld scripts.	1096	/// Handles GNU ld scripts.
1094	fn openLoadDso(base: *File, path: Path, query: UnresolvedInput.Query) anyerror!void {	1097	fn openLoadDso(base: *File, path: Path, query: UnresolvedInput.Query) anyerror!void {
1095	if (base.tag == .lld) return;	1098	if (base.tag == .lld) return;
1096	const dso = try openDso(path, query.needed, query.weak, query.reexport);	1099	const io = base.comp.io;
1097	errdefer dso.file.close();	1100	const dso = try openDso(io, path, query.needed, query.weak, query.reexport);
		1101	errdefer dso.file.close(io);
1098	loadInput(base, .{ .dso = dso }) catch \|err\| switch (err) {	1102	loadInput(base, .{ .dso = dso }) catch \|err\| switch (err) {
1099	error.BadMagic, error.UnexpectedEndOfFile => {	1103	error.BadMagic, error.UnexpectedEndOfFile => {
1100	if (base.tag != .elf and base.tag != .elf2) return err;	1104	if (base.tag != .elf and base.tag != .elf2) return err;
1101	try loadGnuLdScript(base, path, query, dso.file);	1105	try loadGnuLdScript(base, path, query, dso.file);
1102	dso.file.close();	1106	dso.file.close(io);
1103	return;	1107	return;
1104	},	1108	},
1105	else => return err,	1109	else => return err,
...	@@ -1735,6 +1739,7 @@ pub fn hashInputs(man: *Cache.Manifest, link_inputs: []const Input) !void {	...	@@ -1735,6 +1739,7 @@ pub fn hashInputs(man: *Cache.Manifest, link_inputs: []const Input) !void {
1735	pub fn resolveInputs(	1739	pub fn resolveInputs(
1736	gpa: Allocator,	1740	gpa: Allocator,
1737	arena: Allocator,	1741	arena: Allocator,
		1742	io: Io,
1738	target: *const std.Target,	1743	target: *const std.Target,
1739	/// This function mutates this array but does not take ownership.	1744	/// This function mutates this array but does not take ownership.
1740	/// Allocated with `gpa`.	1745	/// Allocated with `gpa`.
...	@@ -1784,6 +1789,7 @@ pub fn resolveInputs(	...	@@ -1784,6 +1789,7 @@ pub fn resolveInputs(
1784	for (lib_directories) \|lib_directory\| switch (try resolveLibInput(	1789	for (lib_directories) \|lib_directory\| switch (try resolveLibInput(
1785	gpa,	1790	gpa,
1786	arena,	1791	arena,
		1792	io,
1787	unresolved_inputs,	1793	unresolved_inputs,
1788	resolved_inputs,	1794	resolved_inputs,
1789	&checked_paths,	1795	&checked_paths,
...	@@ -1810,6 +1816,7 @@ pub fn resolveInputs(	...	@@ -1810,6 +1816,7 @@ pub fn resolveInputs(
1810	for (lib_directories) \|lib_directory\| switch (try resolveLibInput(	1816	for (lib_directories) \|lib_directory\| switch (try resolveLibInput(
1811	gpa,	1817	gpa,
1812	arena,	1818	arena,
		1819	io,
1813	unresolved_inputs,	1820	unresolved_inputs,
1814	resolved_inputs,	1821	resolved_inputs,
1815	&checked_paths,	1822	&checked_paths,
...	@@ -1837,6 +1844,7 @@ pub fn resolveInputs(	...	@@ -1837,6 +1844,7 @@ pub fn resolveInputs(
1837	switch (try resolveLibInput(	1844	switch (try resolveLibInput(
1838	gpa,	1845	gpa,
1839	arena,	1846	arena,
		1847	io,
1840	unresolved_inputs,	1848	unresolved_inputs,
1841	resolved_inputs,	1849	resolved_inputs,
1842	&checked_paths,	1850	&checked_paths,
...	@@ -1855,6 +1863,7 @@ pub fn resolveInputs(	...	@@ -1855,6 +1863,7 @@ pub fn resolveInputs(
1855	switch (try resolveLibInput(	1863	switch (try resolveLibInput(
1856	gpa,	1864	gpa,
1857	arena,	1865	arena,
		1866	io,
1858	unresolved_inputs,	1867	unresolved_inputs,
1859	resolved_inputs,	1868	resolved_inputs,
1860	&checked_paths,	1869	&checked_paths,
...	@@ -1886,6 +1895,7 @@ pub fn resolveInputs(	...	@@ -1886,6 +1895,7 @@ pub fn resolveInputs(
1886	if (try resolvePathInput(	1895	if (try resolvePathInput(
1887	gpa,	1896	gpa,
1888	arena,	1897	arena,
		1898	io,
1889	unresolved_inputs,	1899	unresolved_inputs,
1890	resolved_inputs,	1900	resolved_inputs,
1891	&ld_script_bytes,	1901	&ld_script_bytes,
...	@@ -1903,6 +1913,7 @@ pub fn resolveInputs(	...	@@ -1903,6 +1913,7 @@ pub fn resolveInputs(
1903	switch ((try resolvePathInput(	1913	switch ((try resolvePathInput(
1904	gpa,	1914	gpa,
1905	arena,	1915	arena,
		1916	io,
1906	unresolved_inputs,	1917	unresolved_inputs,
1907	resolved_inputs,	1918	resolved_inputs,
1908	&ld_script_bytes,	1919	&ld_script_bytes,
...	@@ -1930,6 +1941,7 @@ pub fn resolveInputs(	...	@@ -1930,6 +1941,7 @@ pub fn resolveInputs(
1930	if (try resolvePathInput(	1941	if (try resolvePathInput(
1931	gpa,	1942	gpa,
1932	arena,	1943	arena,
		1944	io,
1933	unresolved_inputs,	1945	unresolved_inputs,
1934	resolved_inputs,	1946	resolved_inputs,
1935	&ld_script_bytes,	1947	&ld_script_bytes,
...	@@ -1969,6 +1981,7 @@ const fatal = std.process.fatal;	...	@@ -1969,6 +1981,7 @@ const fatal = std.process.fatal;
1969	fn resolveLibInput(	1981	fn resolveLibInput(
1970	gpa: Allocator,	1982	gpa: Allocator,
1971	arena: Allocator,	1983	arena: Allocator,
		1984	io: Io,
1972	/// Allocated via `gpa`.	1985	/// Allocated via `gpa`.
1973	unresolved_inputs: *std.ArrayList(UnresolvedInput),	1986	unresolved_inputs: *std.ArrayList(UnresolvedInput),
1974	/// Allocated via `gpa`.	1987	/// Allocated via `gpa`.
...	@@ -1998,7 +2011,7 @@ fn resolveLibInput(	...	@@ -1998,7 +2011,7 @@ fn resolveLibInput(
1998	error.FileNotFound => break :tbd,	2011	error.FileNotFound => break :tbd,
1999	else => \|e\| fatal("unable to search for tbd library '{f}': {s}", .{ test_path, @errorName(e) }),	2012	else => \|e\| fatal("unable to search for tbd library '{f}': {s}", .{ test_path, @errorName(e) }),
2000	};	2013	};
2001	errdefer file.close();	2014	errdefer file.close(io);
2002	return finishResolveLibInput(resolved_inputs, test_path, file, link_mode, name_query.query);	2015	return finishResolveLibInput(resolved_inputs, test_path, file, link_mode, name_query.query);
2003	}	2016	}
2004		2017
...	@@ -2013,7 +2026,7 @@ fn resolveLibInput(	...	@@ -2013,7 +2026,7 @@ fn resolveLibInput(
2013	}),	2026	}),
2014	};	2027	};
2015	try checked_paths.print(gpa, "\n {f}", .{test_path});	2028	try checked_paths.print(gpa, "\n {f}", .{test_path});
2016	switch (try resolvePathInputLib(gpa, arena, unresolved_inputs, resolved_inputs, ld_script_bytes, target, .{	2029	switch (try resolvePathInputLib(gpa, arena, io, unresolved_inputs, resolved_inputs, ld_script_bytes, target, .{
2017	.path = test_path,	2030	.path = test_path,
2018	.query = name_query.query,	2031	.query = name_query.query,
2019	}, link_mode, color)) {	2032	}, link_mode, color)) {
...	@@ -2036,7 +2049,7 @@ fn resolveLibInput(	...	@@ -2036,7 +2049,7 @@ fn resolveLibInput(
2036	test_path, @errorName(e),	2049	test_path, @errorName(e),
2037	}),	2050	}),
2038	};	2051	};
2039	errdefer file.close();	2052	errdefer file.close(io);
2040	return finishResolveLibInput(resolved_inputs, test_path, file, link_mode, name_query.query);	2053	return finishResolveLibInput(resolved_inputs, test_path, file, link_mode, name_query.query);
2041	}	2054	}
2042		2055
...	@@ -2052,7 +2065,7 @@ fn resolveLibInput(	...	@@ -2052,7 +2065,7 @@ fn resolveLibInput(
2052	error.FileNotFound => break :mingw,	2065	error.FileNotFound => break :mingw,
2053	else => \|e\| fatal("unable to search for static library '{f}': {s}", .{ test_path, @errorName(e) }),	2066	else => \|e\| fatal("unable to search for static library '{f}': {s}", .{ test_path, @errorName(e) }),
2054	};	2067	};
2055	errdefer file.close();	2068	errdefer file.close(io);
2056	return finishResolveLibInput(resolved_inputs, test_path, file, link_mode, name_query.query);	2069	return finishResolveLibInput(resolved_inputs, test_path, file, link_mode, name_query.query);
2057	}	2070	}
2058		2071
...	@@ -2087,6 +2100,7 @@ fn finishResolveLibInput(	...	@@ -2087,6 +2100,7 @@ fn finishResolveLibInput(
2087	fn resolvePathInput(	2100	fn resolvePathInput(
2088	gpa: Allocator,	2101	gpa: Allocator,
2089	arena: Allocator,	2102	arena: Allocator,
		2103	io: Io,
2090	/// Allocated with `gpa`.	2104	/// Allocated with `gpa`.
2091	unresolved_inputs: *std.ArrayList(UnresolvedInput),	2105	unresolved_inputs: *std.ArrayList(UnresolvedInput),
2092	/// Allocated with `gpa`.	2106	/// Allocated with `gpa`.
...	@@ -2098,12 +2112,12 @@ fn resolvePathInput(	...	@@ -2098,12 +2112,12 @@ fn resolvePathInput(
2098	color: std.zig.Color,	2112	color: std.zig.Color,
2099	) Allocator.Error!?ResolveLibInputResult {	2113	) Allocator.Error!?ResolveLibInputResult {
2100	switch (Compilation.classifyFileExt(pq.path.sub_path)) {	2114	switch (Compilation.classifyFileExt(pq.path.sub_path)) {
2101	.static_library => return try resolvePathInputLib(gpa, arena, unresolved_inputs, resolved_inputs, ld_script_bytes, target, pq, .static, color),	2115	.static_library => return try resolvePathInputLib(gpa, arena, io, unresolved_inputs, resolved_inputs, ld_script_bytes, target, pq, .static, color),
2102	.shared_library => return try resolvePathInputLib(gpa, arena, unresolved_inputs, resolved_inputs, ld_script_bytes, target, pq, .dynamic, color),	2116	.shared_library => return try resolvePathInputLib(gpa, arena, io, unresolved_inputs, resolved_inputs, ld_script_bytes, target, pq, .dynamic, color),
2103	.object => {	2117	.object => {
2104	var file = pq.path.root_dir.handle.openFile(pq.path.sub_path, .{}) catch \|err\|	2118	var file = pq.path.root_dir.handle.openFile(pq.path.sub_path, .{}) catch \|err\|
2105	fatal("failed to open object {f}: {s}", .{ pq.path, @errorName(err) });	2119	fatal("failed to open object {f}: {s}", .{ pq.path, @errorName(err) });
2106	errdefer file.close();	2120	errdefer file.close(io);
2107	try resolved_inputs.append(gpa, .{ .object = .{	2121	try resolved_inputs.append(gpa, .{ .object = .{
2108	.path = pq.path,	2122	.path = pq.path,
2109	.file = file,	2123	.file = file,
...	@@ -2115,7 +2129,7 @@ fn resolvePathInput(	...	@@ -2115,7 +2129,7 @@ fn resolvePathInput(
2115	.res => {	2129	.res => {
2116	var file = pq.path.root_dir.handle.openFile(pq.path.sub_path, .{}) catch \|err\|	2130	var file = pq.path.root_dir.handle.openFile(pq.path.sub_path, .{}) catch \|err\|
2117	fatal("failed to open windows resource {f}: {s}", .{ pq.path, @errorName(err) });	2131	fatal("failed to open windows resource {f}: {s}", .{ pq.path, @errorName(err) });
2118	errdefer file.close();	2132	errdefer file.close(io);
2119	try resolved_inputs.append(gpa, .{ .res = .{	2133	try resolved_inputs.append(gpa, .{ .res = .{
2120	.path = pq.path,	2134	.path = pq.path,
2121	.file = file,	2135	.file = file,
...	@@ -2129,6 +2143,7 @@ fn resolvePathInput(	...	@@ -2129,6 +2143,7 @@ fn resolvePathInput(
2129	fn resolvePathInputLib(	2143	fn resolvePathInputLib(
2130	gpa: Allocator,	2144	gpa: Allocator,
2131	arena: Allocator,	2145	arena: Allocator,
		2146	io: Io,
2132	/// Allocated with `gpa`.	2147	/// Allocated with `gpa`.
2133	unresolved_inputs: *std.ArrayList(UnresolvedInput),	2148	unresolved_inputs: *std.ArrayList(UnresolvedInput),
2134	/// Allocated with `gpa`.	2149	/// Allocated with `gpa`.
...	@@ -2155,7 +2170,7 @@ fn resolvePathInputLib(	...	@@ -2155,7 +2170,7 @@ fn resolvePathInputLib(
2155	@tagName(link_mode), std.fmt.alt(test_path, .formatEscapeChar), @errorName(e),	2170	@tagName(link_mode), std.fmt.alt(test_path, .formatEscapeChar), @errorName(e),
2156	}),	2171	}),
2157	};	2172	};
2158	errdefer file.close();	2173	errdefer file.close(io);
2159	try ld_script_bytes.resize(gpa, @max(std.elf.MAGIC.len, std.elf.ARMAG.len));	2174	try ld_script_bytes.resize(gpa, @max(std.elf.MAGIC.len, std.elf.ARMAG.len));
2160	const n = file.preadAll(ld_script_bytes.items, 0) catch \|err\| fatal("failed to read '{f}': {s}", .{	2175	const n = file.preadAll(ld_script_bytes.items, 0) catch \|err\| fatal("failed to read '{f}': {s}", .{
2161	std.fmt.alt(test_path, .formatEscapeChar), @errorName(err),	2176	std.fmt.alt(test_path, .formatEscapeChar), @errorName(err),
...	@@ -2223,7 +2238,7 @@ fn resolvePathInputLib(	...	@@ -2223,7 +2238,7 @@ fn resolvePathInputLib(
2223	} });	2238	} });
2224	}	2239	}
2225	}	2240	}
2226	file.close();	2241	file.close(io);
2227	return .ok;	2242	return .ok;
2228	}	2243	}
2229		2244
...	@@ -2233,13 +2248,13 @@ fn resolvePathInputLib(	...	@@ -2233,13 +2248,13 @@ fn resolvePathInputLib(
2233	@tagName(link_mode), test_path, @errorName(e),	2248	@tagName(link_mode), test_path, @errorName(e),
2234	}),	2249	}),
2235	};	2250	};
2236	errdefer file.close();	2251	errdefer file.close(io);
2237	return finishResolveLibInput(resolved_inputs, test_path, file, link_mode, pq.query);	2252	return finishResolveLibInput(resolved_inputs, test_path, file, link_mode, pq.query);
2238	}	2253	}
2239		2254
2240	pub fn openObject(path: Path, must_link: bool, hidden: bool) !Input.Object {	2255	pub fn openObject(io: Io, path: Path, must_link: bool, hidden: bool) !Input.Object {
2241	var file = try path.root_dir.handle.openFile(path.sub_path, .{});	2256	var file = try path.root_dir.handle.openFile(path.sub_path, .{});
2242	errdefer file.close();	2257	errdefer file.close(io);
2243	return .{	2258	return .{
2244	.path = path,	2259	.path = path,
2245	.file = file,	2260	.file = file,
...	@@ -2248,9 +2263,9 @@ pub fn openObject(path: Path, must_link: bool, hidden: bool) !Input.Object {	...	@@ -2248,9 +2263,9 @@ pub fn openObject(path: Path, must_link: bool, hidden: bool) !Input.Object {
2248	};	2263	};
2249	}	2264	}
2250		2265
2251	pub fn openDso(path: Path, needed: bool, weak: bool, reexport: bool) !Input.Dso {	2266	pub fn openDso(io: Io, path: Path, needed: bool, weak: bool, reexport: bool) !Input.Dso {
2252	var file = try path.root_dir.handle.openFile(path.sub_path, .{});	2267	var file = try path.root_dir.handle.openFile(path.sub_path, .{});
2253	errdefer file.close();	2268	errdefer file.close(io);
2254	return .{	2269	return .{
2255	.path = path,	2270	.path = path,
2256	.file = file,	2271	.file = file,
...	@@ -2260,20 +2275,20 @@ pub fn openDso(path: Path, needed: bool, weak: bool, reexport: bool) !Input.Dso	...	@@ -2260,20 +2275,20 @@ pub fn openDso(path: Path, needed: bool, weak: bool, reexport: bool) !Input.Dso
2260	};	2275	};
2261	}	2276	}
2262		2277
2263	pub fn openObjectInput(diags: *Diags, path: Path) error{LinkFailure}!Input {	2278	pub fn openObjectInput(io: Io, diags: *Diags, path: Path) error{LinkFailure}!Input {
2264	return .{ .object = openObject(path, false, false) catch \|err\| {	2279	return .{ .object = openObject(io, path, false, false) catch \|err\| {
2265	return diags.failParse(path, "failed to open {f}: {s}", .{ path, @errorName(err) });	2280	return diags.failParse(path, "failed to open {f}: {s}", .{ path, @errorName(err) });
2266	} };	2281	} };
2267	}	2282	}
2268		2283
2269	pub fn openArchiveInput(diags: *Diags, path: Path, must_link: bool, hidden: bool) error{LinkFailure}!Input {	2284	pub fn openArchiveInput(io: Io, diags: *Diags, path: Path, must_link: bool, hidden: bool) error{LinkFailure}!Input {
2270	return .{ .archive = openObject(path, must_link, hidden) catch \|err\| {	2285	return .{ .archive = openObject(io, path, must_link, hidden) catch \|err\| {
2271	return diags.failParse(path, "failed to open {f}: {s}", .{ path, @errorName(err) });	2286	return diags.failParse(path, "failed to open {f}: {s}", .{ path, @errorName(err) });
2272	} };	2287	} };
2273	}	2288	}
2274		2289
2275	pub fn openDsoInput(diags: *Diags, path: Path, needed: bool, weak: bool, reexport: bool) error{LinkFailure}!Input {	2290	pub fn openDsoInput(io: Io, diags: *Diags, path: Path, needed: bool, weak: bool, reexport: bool) error{LinkFailure}!Input {
2276	return .{ .dso = openDso(path, needed, weak, reexport) catch \|err\| {	2291	return .{ .dso = openDso(io, path, needed, weak, reexport) catch \|err\| {
2277	return diags.failParse(path, "failed to open {f}: {s}", .{ path, @errorName(err) });	2292	return diags.failParse(path, "failed to open {f}: {s}", .{ path, @errorName(err) });
2278	} };	2293	} };
2279	}	2294	}

src/link/C.zig+4-2

src/link/Elf.zig+4-2

 @@ -406,10 +406,12 @@ pub fn open(
 }
 pub fn deinit(self: *Elf) void {
-    const gpa = self.base.comp.gpa;
+    const comp = self.base.comp;
+    const gpa = comp.gpa;
+    const io = comp.io;
     for (self.file_handles.items) |fh| {
-        fh.close();
+        fh.close(io);
     }
     self.file_handles.deinit(gpa);

src/link/Lld.zig+1-1

...	@@ -1628,7 +1628,7 @@ fn spawnLld(comp: *Compilation, arena: Allocator, argv: []const []const u8) !voi	...	@@ -1628,7 +1628,7 @@ fn spawnLld(comp: *Compilation, arena: Allocator, argv: []const []const u8) !voi
1628	defer comp.dirs.local_cache.handle.deleteFileZ(rsp_path) catch \|err\|	1628	defer comp.dirs.local_cache.handle.deleteFileZ(rsp_path) catch \|err\|
1629	log.warn("failed to delete response file {s}: {s}", .{ rsp_path, @errorName(err) });	1629	log.warn("failed to delete response file {s}: {s}", .{ rsp_path, @errorName(err) });
1630	{	1630	{
1631	defer rsp_file.close();	1631	defer rsp_file.close(io);
1632	var rsp_file_buffer: [1024]u8 = undefined;	1632	var rsp_file_buffer: [1024]u8 = undefined;
1633	var rsp_file_writer = rsp_file.writer(&rsp_file_buffer);	1633	var rsp_file_writer = rsp_file.writer(&rsp_file_buffer);
1634	const rsp_writer = &rsp_file_writer.interface;	1634	const rsp_writer = &rsp_file_writer.interface;

src/link/MachO.zig+11-5

 @@ -267,14 +267,16 @@ pub fn open(
 }
 pub fn deinit(self: *MachO) void {
-    const gpa = self.base.comp.gpa;
+    const comp = self.base.comp;
+    const gpa = comp.gpa;
+    const io = comp.io;
     if (self.d_sym) |*d_sym| {
         d_sym.deinit();
     }
     for (self.file_handles.items) |handle| {
-        handle.close();
+        handle.close(io);
     }
     self.file_handles.deinit(gpa);
 @@ -3257,8 +3259,10 @@ const InitMetadataOptions = struct {
 };
 pub fn closeDebugInfo(self: *MachO) bool {
+    const comp = self.base.comp;
+    const io = comp.io;
     const d_sym = &(self.d_sym orelse return false);
-    d_sym.file.?.close();
+    d_sym.file.?.close(io);
     d_sym.file = null;
     return true;
 }
 @@ -3269,7 +3273,9 @@ pub fn reopenDebugInfo(self: *MachO) !void {
     assert(!self.base.comp.config.use_llvm);
     assert(self.base.comp.config.debug_format == .dwarf);
-    const gpa = self.base.comp.gpa;
+    const comp = self.base.comp;
+    const io = comp.io;
+    const gpa = comp.gpa;
     const sep = fs.path.sep_str;
     const d_sym_path = try std.fmt.allocPrint(
         gpa,
 @@ -3279,7 +3285,7 @@ pub fn reopenDebugInfo(self: *MachO) !void {
     defer gpa.free(d_sym_path);
     var d_sym_bundle = try self.base.emit.root_dir.handle.makeOpenPath(d_sym_path, .{});
-    defer d_sym_bundle.close();
+    defer d_sym_bundle.close(io);
     self.d_sym.?.file = try d_sym_bundle.createFile(fs.path.basename(self.base.emit.sub_path), .{
         .truncate = false,

src/link/MachO/DebugSymbols.zig+26-24

 @@ -1,5 +1,28 @@
+const DebugSymbols = @This();
+const std = @import("std");
+const Io = std.Io;
+const assert = std.debug.assert;
+const fs = std.fs;
+const log = std.log.scoped(.link_dsym);
+const macho = std.macho;
+const makeStaticString = MachO.makeStaticString;
+const math = std.math;
+const mem = std.mem;
+const Writer = std.Io.Writer;
+const Allocator = std.mem.Allocator;
+const link = @import("../../link.zig");
+const MachO = @import("../MachO.zig");
+const StringTable = @import("../StringTable.zig");
+const Type = @import("../../Type.zig");
+const trace = @import("../../tracy.zig").trace;
+const load_commands = @import("load_commands.zig");
+const padToIdeal = MachO.padToIdeal;
+io: Io,
 allocator: Allocator,
-file: ?fs.File,
+file: ?Io.File,
 symtab_cmd: macho.symtab_command = .{},
 uuid_cmd: macho.uuid_command = .{ .uuid = [_]u8{0} ** 16 },
 @@ -208,7 +231,8 @@ pub fn flush(self: *DebugSymbols, macho_file: *MachO) !void {
 pub fn deinit(self: *DebugSymbols) void {
     const gpa = self.allocator;
-    if (self.file) |file| file.close();
+    const io = self.io;
+    if (self.file) |file| file.close(io);
     self.segments.deinit(gpa);
     self.sections.deinit(gpa);
     self.relocs.deinit(gpa);
 @@ -443,25 +467,3 @@ pub fn getSection(self: DebugSymbols, sect: u8) macho.section_64 {
     assert(sect < self.sections.items.len);
     return self.sections.items[sect];
 }
-const DebugSymbols = @This();
-const std = @import("std");
-const build_options = @import("build_options");
-const assert = std.debug.assert;
-const fs = std.fs;
-const link = @import("../../link.zig");
-const load_commands = @import("load_commands.zig");
-const log = std.log.scoped(.link_dsym);
-const macho = std.macho;
-const makeStaticString = MachO.makeStaticString;
-const math = std.math;
-const mem = std.mem;
-const padToIdeal = MachO.padToIdeal;
-const trace = @import("../../tracy.zig").trace;
-const Writer = std.Io.Writer;
-const Allocator = mem.Allocator;
-const MachO = @import("../MachO.zig");
-const StringTable = @import("../StringTable.zig");
-const Type = @import("../../Type.zig");

src/link/Wasm.zig+2-2

...	@@ -3032,7 +3032,7 @@ fn parseObject(wasm: *Wasm, obj: link.Input.Object) !void {	...	@@ -3032,7 +3032,7 @@ fn parseObject(wasm: *Wasm, obj: link.Input.Object) !void {
3032	const io = wasm.base.comp.io;	3032	const io = wasm.base.comp.io;
3033	const gc_sections = wasm.base.gc_sections;	3033	const gc_sections = wasm.base.gc_sections;
3034		3034
3035	defer obj.file.close();	3035	defer obj.file.close(io);
3036		3036
3037	var file_reader = obj.file.reader(io, &.{});	3037	var file_reader = obj.file.reader(io, &.{});
3038		3038
...	@@ -3060,7 +3060,7 @@ fn parseArchive(wasm: *Wasm, obj: link.Input.Object) !void {	...	@@ -3060,7 +3060,7 @@ fn parseArchive(wasm: *Wasm, obj: link.Input.Object) !void {
3060	const io = wasm.base.comp.io;	3060	const io = wasm.base.comp.io;
3061	const gc_sections = wasm.base.gc_sections;	3061	const gc_sections = wasm.base.gc_sections;
3062		3062
3063	defer obj.file.close();	3063	defer obj.file.close(io);
3064		3064
3065	var file_reader = obj.file.reader(io, &.{});	3065	var file_reader = obj.file.reader(io, &.{});
3066		3066

src/main.zig+71-64

...	@@ -328,21 +328,21 @@ fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {	...	@@ -328,21 +328,21 @@ fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
328	.prepend_global_cache_path = true,	328	.prepend_global_cache_path = true,
329	});	329	});
330	} else if (mem.eql(u8, cmd, "init")) {	330	} else if (mem.eql(u8, cmd, "init")) {
331	return cmdInit(gpa, arena, cmd_args);	331	return cmdInit(gpa, arena, io, cmd_args);
332	} else if (mem.eql(u8, cmd, "targets")) {	332	} else if (mem.eql(u8, cmd, "targets")) {
333	dev.check(.targets_command);	333	dev.check(.targets_command);
334	const host = std.zig.resolveTargetQueryOrFatal(io, .{});	334	const host = std.zig.resolveTargetQueryOrFatal(io, .{});
335	var stdout_writer = fs.File.stdout().writer(&stdout_buffer);	335	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
336	try @import("print_targets.zig").cmdTargets(arena, cmd_args, &stdout_writer.interface, &host);	336	try @import("print_targets.zig").cmdTargets(arena, io, cmd_args, &stdout_writer.interface, &host);
337	return stdout_writer.interface.flush();	337	return stdout_writer.interface.flush();
338	} else if (mem.eql(u8, cmd, "version")) {	338	} else if (mem.eql(u8, cmd, "version")) {
339	dev.check(.version_command);	339	dev.check(.version_command);
340	try fs.File.stdout().writeAll(build_options.version ++ "\n");	340	try Io.File.stdout().writeAll(build_options.version ++ "\n");
341	return;	341	return;
342	} else if (mem.eql(u8, cmd, "env")) {	342	} else if (mem.eql(u8, cmd, "env")) {
343	dev.check(.env_command);	343	dev.check(.env_command);
344	const host = std.zig.resolveTargetQueryOrFatal(io, .{});	344	const host = std.zig.resolveTargetQueryOrFatal(io, .{});
345	var stdout_writer = fs.File.stdout().writer(&stdout_buffer);	345	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
346	try @import("print_env.zig").cmdEnv(	346	try @import("print_env.zig").cmdEnv(
347	arena,	347	arena,
348	&stdout_writer.interface,	348	&stdout_writer.interface,
...	@@ -358,10 +358,10 @@ fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {	...	@@ -358,10 +358,10 @@ fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
358	});	358	});
359	} else if (mem.eql(u8, cmd, "zen")) {	359	} else if (mem.eql(u8, cmd, "zen")) {
360	dev.check(.zen_command);	360	dev.check(.zen_command);
361	return fs.File.stdout().writeAll(info_zen);	361	return Io.File.stdout().writeAll(info_zen);
362	} else if (mem.eql(u8, cmd, "help") or mem.eql(u8, cmd, "-h") or mem.eql(u8, cmd, "--help")) {	362	} else if (mem.eql(u8, cmd, "help") or mem.eql(u8, cmd, "-h") or mem.eql(u8, cmd, "--help")) {
363	dev.check(.help_command);	363	dev.check(.help_command);
364	return fs.File.stdout().writeAll(usage);	364	return Io.File.stdout().writeAll(usage);
365	} else if (mem.eql(u8, cmd, "ast-check")) {	365	} else if (mem.eql(u8, cmd, "ast-check")) {
366	return cmdAstCheck(arena, io, cmd_args);	366	return cmdAstCheck(arena, io, cmd_args);
367	} else if (mem.eql(u8, cmd, "detect-cpu")) {	367	} else if (mem.eql(u8, cmd, "detect-cpu")) {
...	@@ -698,7 +698,7 @@ const Emit = union(enum) {	...	@@ -698,7 +698,7 @@ const Emit = union(enum) {
698	yes: []const u8,	698	yes: []const u8,
699		699
700	const OutputToCacheReason = enum { listen, @"zig run", @"zig test" };	700	const OutputToCacheReason = enum { listen, @"zig run", @"zig test" };
701	fn resolve(emit: Emit, default_basename: []const u8, output_to_cache: ?OutputToCacheReason) Compilation.CreateOptions.Emit {	701	fn resolve(io: Io, emit: Emit, default_basename: []const u8, output_to_cache: ?OutputToCacheReason) Compilation.CreateOptions.Emit {
702	return switch (emit) {	702	return switch (emit) {
703	.no => .no,	703	.no => .no,
704	.yes_default_path => if (output_to_cache != null) .yes_cache else .{ .yes_path = default_basename },	704	.yes_default_path => if (output_to_cache != null) .yes_cache else .{ .yes_path = default_basename },
...	@@ -716,7 +716,7 @@ const Emit = union(enum) {	...	@@ -716,7 +716,7 @@ const Emit = union(enum) {
716	var dir = fs.cwd().openDir(dir_path, .{}) catch \|err\| {	716	var dir = fs.cwd().openDir(dir_path, .{}) catch \|err\| {
717	fatal("unable to open output directory '{s}': {s}", .{ dir_path, @errorName(err) });	717	fatal("unable to open output directory '{s}': {s}", .{ dir_path, @errorName(err) });
718	};	718	};
719	dir.close();	719	dir.close(io);
720	}	720	}
721	break :e .{ .yes_path = path };	721	break :e .{ .yes_path = path };
722	},	722	},
...	@@ -1034,7 +1034,7 @@ fn buildOutputType(	...	@@ -1034,7 +1034,7 @@ fn buildOutputType(
1034	};	1034	};
1035	} else if (mem.startsWith(u8, arg, "-")) {	1035	} else if (mem.startsWith(u8, arg, "-")) {
1036	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {	1036	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
1037	try fs.File.stdout().writeAll(usage_build_generic);	1037	try Io.File.stdout().writeAll(usage_build_generic);
1038	return cleanExit();	1038	return cleanExit();
1039	} else if (mem.eql(u8, arg, "--")) {	1039	} else if (mem.eql(u8, arg, "--")) {
1040	if (arg_mode == .run) {	1040	if (arg_mode == .run) {
...	@@ -2834,9 +2834,9 @@ fn buildOutputType(	...	@@ -2834,9 +2834,9 @@ fn buildOutputType(
2834	} else if (mem.eql(u8, arg, "-V")) {	2834	} else if (mem.eql(u8, arg, "-V")) {
2835	warn("ignoring request for supported emulations: unimplemented", .{});	2835	warn("ignoring request for supported emulations: unimplemented", .{});
2836	} else if (mem.eql(u8, arg, "-v")) {	2836	} else if (mem.eql(u8, arg, "-v")) {
2837	try fs.File.stdout().writeAll("zig ld " ++ build_options.version ++ "\n");	2837	try Io.File.stdout().writeAll("zig ld " ++ build_options.version ++ "\n");
2838	} else if (mem.eql(u8, arg, "--version")) {	2838	} else if (mem.eql(u8, arg, "--version")) {
2839	try fs.File.stdout().writeAll("zig ld " ++ build_options.version ++ "\n");	2839	try Io.File.stdout().writeAll("zig ld " ++ build_options.version ++ "\n");
2840	process.exit(0);	2840	process.exit(0);
2841	} else {	2841	} else {
2842	fatal("unsupported linker arg: {s}", .{arg});	2842	fatal("unsupported linker arg: {s}", .{arg});
...	@@ -3251,8 +3251,8 @@ fn buildOutputType(	...	@@ -3251,8 +3251,8 @@ fn buildOutputType(
3251	}	3251	}
3252	}	3252	}
3253		3253
3254	var cleanup_emit_bin_dir: ?fs.Dir = null;	3254	var cleanup_emit_bin_dir: ?Io.Dir = null;
3255	defer if (cleanup_emit_bin_dir) \|*dir\| dir.close();	3255	defer if (cleanup_emit_bin_dir) \|*dir\| dir.close(io);
3256		3256
3257	// For `zig run` and `zig test`, we don't want to put the binary in the cwd by default. So, if	3257	// For `zig run` and `zig test`, we don't want to put the binary in the cwd by default. So, if
3258	// the binary is requested with no explicit path (as is the default), we emit to the cache.	3258	// the binary is requested with no explicit path (as is the default), we emit to the cache.
...	@@ -3307,7 +3307,7 @@ fn buildOutputType(	...	@@ -3307,7 +3307,7 @@ fn buildOutputType(
3307	var dir = fs.cwd().openDir(dir_path, .{}) catch \|err\| {	3307	var dir = fs.cwd().openDir(dir_path, .{}) catch \|err\| {
3308	fatal("unable to open output directory '{s}': {s}", .{ dir_path, @errorName(err) });	3308	fatal("unable to open output directory '{s}': {s}", .{ dir_path, @errorName(err) });
3309	};	3309	};
3310	dir.close();	3310	dir.close(io);
3311	}	3311	}
3312	break :emit .{ .yes_path = path };	3312	break :emit .{ .yes_path = path };
3313	},	3313	},
...	@@ -3390,7 +3390,7 @@ fn buildOutputType(	...	@@ -3390,7 +3390,7 @@ fn buildOutputType(
3390	// will be a hash of its contents — so multiple invocations of	3390	// will be a hash of its contents — so multiple invocations of
3391	// `zig cc -` will result in the same temp file name.	3391	// `zig cc -` will result in the same temp file name.
3392	var f = try dirs.local_cache.handle.createFile(dump_path, .{});	3392	var f = try dirs.local_cache.handle.createFile(dump_path, .{});
3393	defer f.close();	3393	defer f.close(io);
3394		3394
3395	// Re-using the hasher from Cache, since the functional requirements	3395	// Re-using the hasher from Cache, since the functional requirements
3396	// for the hashing algorithm here and in the cache are the same.	3396	// for the hashing algorithm here and in the cache are the same.
...	@@ -3399,7 +3399,7 @@ fn buildOutputType(	...	@@ -3399,7 +3399,7 @@ fn buildOutputType(
3399	var file_writer = f.writer(&.{});	3399	var file_writer = f.writer(&.{});
3400	var buffer: [1000]u8 = undefined;	3400	var buffer: [1000]u8 = undefined;
3401	var hasher = file_writer.interface.hashed(Cache.Hasher.init("0123456789abcdef"), &buffer);	3401	var hasher = file_writer.interface.hashed(Cache.Hasher.init("0123456789abcdef"), &buffer);
3402	var stdin_reader = fs.File.stdin().readerStreaming(io, &.{});	3402	var stdin_reader = Io.File.stdin().readerStreaming(io, &.{});
3403	_ = hasher.writer.sendFileAll(&stdin_reader, .unlimited) catch \|err\| switch (err) {	3403	_ = hasher.writer.sendFileAll(&stdin_reader, .unlimited) catch \|err\| switch (err) {
3404	error.WriteFailed => fatal("failed to write {s}: {t}", .{ dump_path, file_writer.err.? }),	3404	error.WriteFailed => fatal("failed to write {s}: {t}", .{ dump_path, file_writer.err.? }),
3405	else => fatal("failed to pipe stdin to {s}: {t}", .{ dump_path, err }),	3405	else => fatal("failed to pipe stdin to {s}: {t}", .{ dump_path, err }),
...	@@ -3630,13 +3630,13 @@ fn buildOutputType(	...	@@ -3630,13 +3630,13 @@ fn buildOutputType(
3630	if (show_builtin) {	3630	if (show_builtin) {
3631	const builtin_opts = comp.root_mod.getBuiltinOptions(comp.config);	3631	const builtin_opts = comp.root_mod.getBuiltinOptions(comp.config);
3632	const source = try builtin_opts.generate(arena);	3632	const source = try builtin_opts.generate(arena);
3633	return fs.File.stdout().writeAll(source);	3633	return Io.File.stdout().writeAll(source);
3634	}	3634	}
3635	switch (listen) {	3635	switch (listen) {
3636	.none => {},	3636	.none => {},
3637	.stdio => {	3637	.stdio => {
3638	var stdin_reader = fs.File.stdin().reader(io, &stdin_buffer);	3638	var stdin_reader = Io.File.stdin().reader(io, &stdin_buffer);
3639	var stdout_writer = fs.File.stdout().writer(&stdout_buffer);	3639	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
3640	try serve(	3640	try serve(
3641	comp,	3641	comp,
3642	&stdin_reader.interface,	3642	&stdin_reader.interface,
...	@@ -4034,6 +4034,7 @@ fn createModule(	...	@@ -4034,6 +4034,7 @@ fn createModule(
4034	link.resolveInputs(	4034	link.resolveInputs(
4035	gpa,	4035	gpa,
4036	arena,	4036	arena,
		4037	io,
4037	target,	4038	target,
4038	&unresolved_link_inputs,	4039	&unresolved_link_inputs,
4039	&create_module.link_inputs,	4040	&create_module.link_inputs,
...	@@ -4689,8 +4690,8 @@ fn cmdTranslateC(	...	@@ -4689,8 +4690,8 @@ fn cmdTranslateC(
4689	@errorName(err),	4690	@errorName(err),
4690	});	4691	});
4691	};	4692	};
4692	defer zig_file.close();	4693	defer zig_file.close(io);
4693	var stdout_writer = fs.File.stdout().writer(&stdout_buffer);	4694	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
4694	var file_reader = zig_file.reader(io, &.{});	4695	var file_reader = zig_file.reader(io, &.{});
4695	_ = try stdout_writer.interface.sendFileAll(&file_reader, .unlimited);	4696	_ = try stdout_writer.interface.sendFileAll(&file_reader, .unlimited);
4696	try stdout_writer.interface.flush();	4697	try stdout_writer.interface.flush();
...	@@ -4728,7 +4729,7 @@ const usage_init =	...	@@ -4728,7 +4729,7 @@ const usage_init =
4728	\\	4729	\\
4729	;	4730	;
4730		4731
4731	fn cmdInit(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {	4732	fn cmdInit(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !void {
4732	dev.check(.init_command);	4733	dev.check(.init_command);
4733		4734
4734	var template: enum { example, minimal } = .example;	4735	var template: enum { example, minimal } = .example;
...	@@ -4740,7 +4741,7 @@ fn cmdInit(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {	...	@@ -4740,7 +4741,7 @@ fn cmdInit(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
4740	if (mem.eql(u8, arg, "-m") or mem.eql(u8, arg, "--minimal")) {	4741	if (mem.eql(u8, arg, "-m") or mem.eql(u8, arg, "--minimal")) {
4741	template = .minimal;	4742	template = .minimal;
4742	} else if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {	4743	} else if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
4743	try fs.File.stdout().writeAll(usage_init);	4744	try Io.File.stdout().writeAll(usage_init);
4744	return cleanExit();	4745	return cleanExit();
4745	} else {	4746	} else {
4746	fatal("unrecognized parameter: '{s}'", .{arg});	4747	fatal("unrecognized parameter: '{s}'", .{arg});
...	@@ -4759,7 +4760,7 @@ fn cmdInit(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {	...	@@ -4759,7 +4760,7 @@ fn cmdInit(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
4759		4760
4760	switch (template) {	4761	switch (template) {
4761	.example => {	4762	.example => {
4762	var templates = findTemplates(gpa, arena);	4763	var templates = findTemplates(gpa, arena, io);
4763	defer templates.deinit();	4764	defer templates.deinit();
4764		4765
4765	const s = fs.path.sep_str;	4766	const s = fs.path.sep_str;
...	@@ -4789,7 +4790,7 @@ fn cmdInit(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {	...	@@ -4789,7 +4790,7 @@ fn cmdInit(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
4789	return cleanExit();	4790	return cleanExit();
4790	},	4791	},
4791	.minimal => {	4792	.minimal => {
4792	writeSimpleTemplateFile(Package.Manifest.basename,	4793	writeSimpleTemplateFile(io, Package.Manifest.basename,
4793	\\.{{	4794	\\.{{
4794	\\ .name = .{s},	4795	\\ .name = .{s},
4795	\\ .version = "0.0.1",	4796	\\ .version = "0.0.1",
...	@@ -4806,7 +4807,7 @@ fn cmdInit(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {	...	@@ -4806,7 +4807,7 @@ fn cmdInit(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
4806	else => fatal("failed to create '{s}': {s}", .{ Package.Manifest.basename, @errorName(err) }),	4807	else => fatal("failed to create '{s}': {s}", .{ Package.Manifest.basename, @errorName(err) }),
4807	error.PathAlreadyExists => fatal("refusing to overwrite '{s}'", .{Package.Manifest.basename}),	4808	error.PathAlreadyExists => fatal("refusing to overwrite '{s}'", .{Package.Manifest.basename}),
4808	};	4809	};
4809	writeSimpleTemplateFile(Package.build_zig_basename,	4810	writeSimpleTemplateFile(io, Package.build_zig_basename,
4810	\\const std = @import("std");	4811	\\const std = @import("std");
4811	\\	4812	\\
4812	\\pub fn build(b: *std.Build) void {{	4813	\\pub fn build(b: *std.Build) void {{
...	@@ -5203,8 +5204,8 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8)	...	@@ -5203,8 +5204,8 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8)
5203	.parent = root_mod,	5204	.parent = root_mod,
5204	});	5205	});
5205		5206
5206	var cleanup_build_dir: ?fs.Dir = null;	5207	var cleanup_build_dir: ?Io.Dir = null;
5207	defer if (cleanup_build_dir) \|*dir\| dir.close();	5208	defer if (cleanup_build_dir) \|*dir\| dir.close(io);
5208		5209
5209	if (dev.env.supports(.fetch_command)) {	5210	if (dev.env.supports(.fetch_command)) {
5210	const fetch_prog_node = root_prog_node.start("Fetch Packages", 0);	5211	const fetch_prog_node = root_prog_node.start("Fetch Packages", 0);
...	@@ -5296,6 +5297,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8)	...	@@ -5296,6 +5297,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8)
5296	try job_queue.createDependenciesSource(&source_buf);	5297	try job_queue.createDependenciesSource(&source_buf);
5297	const deps_mod = try createDependenciesModule(	5298	const deps_mod = try createDependenciesModule(
5298	arena,	5299	arena,
		5300	io,
5299	source_buf.items,	5301	source_buf.items,
5300	root_mod,	5302	root_mod,
5301	dirs,	5303	dirs,
...	@@ -5357,6 +5359,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8)	...	@@ -5357,6 +5359,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8)
5357	}	5359	}
5358	} else try createEmptyDependenciesModule(	5360	} else try createEmptyDependenciesModule(
5359	arena,	5361	arena,
		5362	io,
5360	root_mod,	5363	root_mod,
5361	dirs,	5364	dirs,
5362	config,	5365	config,
...	@@ -5623,7 +5626,7 @@ fn jitCmd(	...	@@ -5623,7 +5626,7 @@ fn jitCmd(
5623	defer comp.destroy();	5626	defer comp.destroy();
5624		5627
5625	if (options.server) {	5628	if (options.server) {
5626	var stdout_writer = fs.File.stdout().writer(&stdout_buffer);	5629	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
5627	var server: std.zig.Server = .{	5630	var server: std.zig.Server = .{
5628	.out = &stdout_writer.interface,	5631	.out = &stdout_writer.interface,
5629	.in = undefined, // won't be receiving messages	5632	.in = undefined, // won't be receiving messages
...	@@ -6156,7 +6159,7 @@ fn cmdAstCheck(arena: Allocator, io: Io, args: []const []const u8) !void {	...	@@ -6156,7 +6159,7 @@ fn cmdAstCheck(arena: Allocator, io: Io, args: []const []const u8) !void {
6156	const arg = args[i];	6159	const arg = args[i];
6157	if (mem.startsWith(u8, arg, "-")) {	6160	if (mem.startsWith(u8, arg, "-")) {
6158	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {	6161	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
6159	try fs.File.stdout().writeAll(usage_ast_check);	6162	try Io.File.stdout().writeAll(usage_ast_check);
6160	return cleanExit();	6163	return cleanExit();
6161	} else if (mem.eql(u8, arg, "-t")) {	6164	} else if (mem.eql(u8, arg, "-t")) {
6162	want_output_text = true;	6165	want_output_text = true;
...	@@ -6187,9 +6190,9 @@ fn cmdAstCheck(arena: Allocator, io: Io, args: []const []const u8) !void {	...	@@ -6187,9 +6190,9 @@ fn cmdAstCheck(arena: Allocator, io: Io, args: []const []const u8) !void {
6187	break :file fs.cwd().openFile(p, .{}) catch \|err\| {	6190	break :file fs.cwd().openFile(p, .{}) catch \|err\| {
6188	fatal("unable to open file '{s}' for ast-check: {s}", .{ display_path, @errorName(err) });	6191	fatal("unable to open file '{s}' for ast-check: {s}", .{ display_path, @errorName(err) });
6189	};	6192	};
6190	} else fs.File.stdin();	6193	} else Io.File.stdin();
6191	defer if (zig_source_path != null) f.close();	6194	defer if (zig_source_path != null) f.close(io);
6192	var file_reader: fs.File.Reader = f.reader(io, &stdin_buffer);	6195	var file_reader: Io.File.Reader = f.reader(io, &stdin_buffer);
6193	break :s std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch \|err\| {	6196	break :s std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch \|err\| {
6194	fatal("unable to load file '{s}' for ast-check: {s}", .{ display_path, @errorName(err) });	6197	fatal("unable to load file '{s}' for ast-check: {s}", .{ display_path, @errorName(err) });
6195	};	6198	};
...	@@ -6207,7 +6210,7 @@ fn cmdAstCheck(arena: Allocator, io: Io, args: []const []const u8) !void {	...	@@ -6207,7 +6210,7 @@ fn cmdAstCheck(arena: Allocator, io: Io, args: []const []const u8) !void {
6207		6210
6208	const tree = try Ast.parse(arena, source, mode);	6211	const tree = try Ast.parse(arena, source, mode);
6209		6212
6210	var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);	6213	var stdout_writer = Io.File.stdout().writerStreaming(&stdout_buffer);
6211	const stdout_bw = &stdout_writer.interface;	6214	const stdout_bw = &stdout_writer.interface;
6212	switch (mode) {	6215	switch (mode) {
6213	.zig => {	6216	.zig => {
...	@@ -6330,7 +6333,7 @@ fn cmdDetectCpu(io: Io, args: []const []const u8) !void {	...	@@ -6330,7 +6333,7 @@ fn cmdDetectCpu(io: Io, args: []const []const u8) !void {
6330	const arg = args[i];	6333	const arg = args[i];
6331	if (mem.startsWith(u8, arg, "-")) {	6334	if (mem.startsWith(u8, arg, "-")) {
6332	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {	6335	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
6333	try fs.File.stdout().writeAll(detect_cpu_usage);	6336	try Io.File.stdout().writeAll(detect_cpu_usage);
6334	return cleanExit();	6337	return cleanExit();
6335	} else if (mem.eql(u8, arg, "--llvm")) {	6338	} else if (mem.eql(u8, arg, "--llvm")) {
6336	use_llvm = true;	6339	use_llvm = true;
...	@@ -6422,7 +6425,7 @@ fn detectNativeCpuWithLLVM(	...	@@ -6422,7 +6425,7 @@ fn detectNativeCpuWithLLVM(
6422	}	6425	}
6423		6426
6424	fn printCpu(cpu: std.Target.Cpu) !void {	6427	fn printCpu(cpu: std.Target.Cpu) !void {
6425	var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);	6428	var stdout_writer = Io.File.stdout().writerStreaming(&stdout_buffer);
6426	const stdout_bw = &stdout_writer.interface;	6429	const stdout_bw = &stdout_writer.interface;
6427		6430
6428	if (cpu.model.llvm_name) \|llvm_name\| {	6431	if (cpu.model.llvm_name) \|llvm_name\| {
...	@@ -6471,7 +6474,7 @@ fn cmdDumpLlvmInts(	...	@@ -6471,7 +6474,7 @@ fn cmdDumpLlvmInts(
6471	const dl = tm.createTargetDataLayout();	6474	const dl = tm.createTargetDataLayout();
6472	const context = llvm.Context.create();	6475	const context = llvm.Context.create();
6473		6476
6474	var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);	6477	var stdout_writer = Io.File.stdout().writerStreaming(&stdout_buffer);
6475	const stdout_bw = &stdout_writer.interface;	6478	const stdout_bw = &stdout_writer.interface;
6476	for ([_]u16{ 1, 8, 16, 32, 64, 128, 256 }) \|bits\| {	6479	for ([_]u16{ 1, 8, 16, 32, 64, 128, 256 }) \|bits\| {
6477	const int_type = context.intType(bits);	6480	const int_type = context.intType(bits);
...	@@ -6494,10 +6497,10 @@ fn cmdDumpZir(arena: Allocator, io: Io, args: []const []const u8) !void {	...	@@ -6494,10 +6497,10 @@ fn cmdDumpZir(arena: Allocator, io: Io, args: []const []const u8) !void {
6494	var f = fs.cwd().openFile(cache_file, .{}) catch \|err\| {	6497	var f = fs.cwd().openFile(cache_file, .{}) catch \|err\| {
6495	fatal("unable to open zir cache file for dumping '{s}': {s}", .{ cache_file, @errorName(err) });	6498	fatal("unable to open zir cache file for dumping '{s}': {s}", .{ cache_file, @errorName(err) });
6496	};	6499	};
6497	defer f.close();	6500	defer f.close(io);
6498		6501
6499	const zir = try Zcu.loadZirCache(arena, io, f);	6502	const zir = try Zcu.loadZirCache(arena, io, f);
6500	var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);	6503	var stdout_writer = Io.File.stdout().writerStreaming(&stdout_buffer);
6501	const stdout_bw = &stdout_writer.interface;	6504	const stdout_bw = &stdout_writer.interface;
6502	{	6505	{
6503	const instruction_bytes = zir.instructions.len *	6506	const instruction_bytes = zir.instructions.len *
...	@@ -6540,16 +6543,16 @@ fn cmdChangelist(arena: Allocator, io: Io, args: []const []const u8) !void {	...	@@ -6540,16 +6543,16 @@ fn cmdChangelist(arena: Allocator, io: Io, args: []const []const u8) !void {
6540	const old_source = source: {	6543	const old_source = source: {
6541	var f = fs.cwd().openFile(old_source_path, .{}) catch \|err\|	6544	var f = fs.cwd().openFile(old_source_path, .{}) catch \|err\|
6542	fatal("unable to open old source file '{s}': {s}", .{ old_source_path, @errorName(err) });	6545	fatal("unable to open old source file '{s}': {s}", .{ old_source_path, @errorName(err) });
6543	defer f.close();	6546	defer f.close(io);
6544	var file_reader: fs.File.Reader = f.reader(io, &stdin_buffer);	6547	var file_reader: Io.File.Reader = f.reader(io, &stdin_buffer);
6545	break :source std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch \|err\|	6548	break :source std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch \|err\|
6546	fatal("unable to read old source file '{s}': {s}", .{ old_source_path, @errorName(err) });	6549	fatal("unable to read old source file '{s}': {s}", .{ old_source_path, @errorName(err) });
6547	};	6550	};
6548	const new_source = source: {	6551	const new_source = source: {
6549	var f = fs.cwd().openFile(new_source_path, .{}) catch \|err\|	6552	var f = fs.cwd().openFile(new_source_path, .{}) catch \|err\|
6550	fatal("unable to open new source file '{s}': {s}", .{ new_source_path, @errorName(err) });	6553	fatal("unable to open new source file '{s}': {s}", .{ new_source_path, @errorName(err) });
6551	defer f.close();	6554	defer f.close(io);
6552	var file_reader: fs.File.Reader = f.reader(io, &stdin_buffer);	6555	var file_reader: Io.File.Reader = f.reader(io, &stdin_buffer);
6553	break :source std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch \|err\|	6556	break :source std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch \|err\|
6554	fatal("unable to read new source file '{s}': {s}", .{ new_source_path, @errorName(err) });	6557	fatal("unable to read new source file '{s}': {s}", .{ new_source_path, @errorName(err) });
6555	};	6558	};
...	@@ -6581,7 +6584,7 @@ fn cmdChangelist(arena: Allocator, io: Io, args: []const []const u8) !void {	...	@@ -6581,7 +6584,7 @@ fn cmdChangelist(arena: Allocator, io: Io, args: []const []const u8) !void {
6581	var inst_map: std.AutoHashMapUnmanaged(Zir.Inst.Index, Zir.Inst.Index) = .empty;	6584	var inst_map: std.AutoHashMapUnmanaged(Zir.Inst.Index, Zir.Inst.Index) = .empty;
6582	try Zcu.mapOldZirToNew(arena, old_zir, new_zir, &inst_map);	6585	try Zcu.mapOldZirToNew(arena, old_zir, new_zir, &inst_map);
6583		6586
6584	var stdout_writer = fs.File.stdout().writerStreaming(&stdout_buffer);	6587	var stdout_writer = Io.File.stdout().writerStreaming(&stdout_buffer);
6585	const stdout_bw = &stdout_writer.interface;	6588	const stdout_bw = &stdout_writer.interface;
6586	{	6589	{
6587	try stdout_bw.print("Instruction mappings:\n", .{});	6590	try stdout_bw.print("Instruction mappings:\n", .{});
...	@@ -6912,7 +6915,7 @@ fn cmdFetch(	...	@@ -6912,7 +6915,7 @@ fn cmdFetch(
6912	const arg = args[i];	6915	const arg = args[i];
6913	if (mem.startsWith(u8, arg, "-")) {	6916	if (mem.startsWith(u8, arg, "-")) {
6914	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {	6917	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
6915	try fs.File.stdout().writeAll(usage_fetch);	6918	try Io.File.stdout().writeAll(usage_fetch);
6916	return cleanExit();	6919	return cleanExit();
6917	} else if (mem.eql(u8, arg, "--global-cache-dir")) {	6920	} else if (mem.eql(u8, arg, "--global-cache-dir")) {
6918	if (i + 1 >= args.len) fatal("expected argument after '{s}'", .{arg});	6921	if (i + 1 >= args.len) fatal("expected argument after '{s}'", .{arg});
...	@@ -6958,7 +6961,7 @@ fn cmdFetch(	...	@@ -6958,7 +6961,7 @@ fn cmdFetch(
6958	.path = p,	6961	.path = p,
6959	};	6962	};
6960	};	6963	};
6961	defer global_cache_directory.handle.close();	6964	defer global_cache_directory.handle.close(io);
6962		6965
6963	var job_queue: Package.Fetch.JobQueue = .{	6966	var job_queue: Package.Fetch.JobQueue = .{
6964	.io = io,	6967	.io = io,
...	@@ -7021,7 +7024,7 @@ fn cmdFetch(	...	@@ -7021,7 +7024,7 @@ fn cmdFetch(
7021		7024
7022	const name = switch (save) {	7025	const name = switch (save) {
7023	.no => {	7026	.no => {
7024	var stdout = fs.File.stdout().writerStreaming(&stdout_buffer);	7027	var stdout = Io.File.stdout().writerStreaming(&stdout_buffer);
7025	try stdout.interface.print("{s}\n", .{package_hash_slice});	7028	try stdout.interface.print("{s}\n", .{package_hash_slice});
7026	try stdout.interface.flush();	7029	try stdout.interface.flush();
7027	return cleanExit();	7030	return cleanExit();
...	@@ -7043,7 +7046,7 @@ fn cmdFetch(	...	@@ -7043,7 +7046,7 @@ fn cmdFetch(
7043		7046
7044	// The name to use in case the manifest file needs to be created now.	7047	// The name to use in case the manifest file needs to be created now.
7045	const init_root_name = fs.path.basename(build_root.directory.path orelse cwd_path);	7048	const init_root_name = fs.path.basename(build_root.directory.path orelse cwd_path);
7046	var manifest, var ast = try loadManifest(gpa, arena, .{	7049	var manifest, var ast = try loadManifest(gpa, arena, io, .{
7047	.root_name = try sanitizeExampleName(arena, init_root_name),	7050	.root_name = try sanitizeExampleName(arena, init_root_name),
7048	.dir = build_root.directory.handle,	7051	.dir = build_root.directory.handle,
7049	.color = color,	7052	.color = color,
...	@@ -7168,6 +7171,7 @@ fn cmdFetch(	...	@@ -7168,6 +7171,7 @@ fn cmdFetch(
7168		7171
7169	fn createEmptyDependenciesModule(	7172	fn createEmptyDependenciesModule(
7170	arena: Allocator,	7173	arena: Allocator,
		7174	io: Io,
7171	main_mod: *Package.Module,	7175	main_mod: *Package.Module,
7172	dirs: Compilation.Directories,	7176	dirs: Compilation.Directories,
7173	global_options: Compilation.Config,	7177	global_options: Compilation.Config,
...	@@ -7176,6 +7180,7 @@ fn createEmptyDependenciesModule(	...	@@ -7176,6 +7180,7 @@ fn createEmptyDependenciesModule(
7176	try Package.Fetch.JobQueue.createEmptyDependenciesSource(&source);	7180	try Package.Fetch.JobQueue.createEmptyDependenciesSource(&source);
7177	_ = try createDependenciesModule(	7181	_ = try createDependenciesModule(
7178	arena,	7182	arena,
		7183	io,
7179	source.items,	7184	source.items,
7180	main_mod,	7185	main_mod,
7181	dirs,	7186	dirs,
...	@@ -7187,6 +7192,7 @@ fn createEmptyDependenciesModule(	...	@@ -7187,6 +7192,7 @@ fn createEmptyDependenciesModule(
7187	/// build runner to obtain via `@import("@dependencies")`.	7192	/// build runner to obtain via `@import("@dependencies")`.
7188	fn createDependenciesModule(	7193	fn createDependenciesModule(
7189	arena: Allocator,	7194	arena: Allocator,
		7195	io: Io,
7190	source: []const u8,	7196	source: []const u8,
7191	main_mod: *Package.Module,	7197	main_mod: *Package.Module,
7192	dirs: Compilation.Directories,	7198	dirs: Compilation.Directories,
...	@@ -7198,7 +7204,7 @@ fn createDependenciesModule(	...	@@ -7198,7 +7204,7 @@ fn createDependenciesModule(
7198	const tmp_dir_sub_path = "tmp" ++ fs.path.sep_str ++ std.fmt.hex(rand_int);	7204	const tmp_dir_sub_path = "tmp" ++ fs.path.sep_str ++ std.fmt.hex(rand_int);
7199	{	7205	{
7200	var tmp_dir = try dirs.local_cache.handle.makeOpenPath(tmp_dir_sub_path, .{});	7206	var tmp_dir = try dirs.local_cache.handle.makeOpenPath(tmp_dir_sub_path, .{});
7201	defer tmp_dir.close();	7207	defer tmp_dir.close(io);
7202	try tmp_dir.writeFile(.{ .sub_path = basename, .data = source });	7208	try tmp_dir.writeFile(.{ .sub_path = basename, .data = source });
7203	}	7209	}
7204		7210
...	@@ -7232,10 +7238,10 @@ fn createDependenciesModule(	...	@@ -7232,10 +7238,10 @@ fn createDependenciesModule(
7232	const BuildRoot = struct {	7238	const BuildRoot = struct {
7233	directory: Cache.Directory,	7239	directory: Cache.Directory,
7234	build_zig_basename: []const u8,	7240	build_zig_basename: []const u8,
7235	cleanup_build_dir: ?fs.Dir,	7241	cleanup_build_dir: ?Io.Dir,
7236		7242
7237	fn deinit(br: *BuildRoot) void {	7243	fn deinit(br: *BuildRoot, io: Io) void {
7238	if (br.cleanup_build_dir) \|*dir\| dir.close();	7244	if (br.cleanup_build_dir) \|*dir\| dir.close(io);
7239	br.* = undefined;	7245	br.* = undefined;
7240	}	7246	}
7241	};	7247	};
...	@@ -7304,13 +7310,14 @@ fn findBuildRoot(arena: Allocator, options: FindBuildRootOptions) !BuildRoot {	...	@@ -7304,13 +7310,14 @@ fn findBuildRoot(arena: Allocator, options: FindBuildRootOptions) !BuildRoot {
7304		7310
7305	const LoadManifestOptions = struct {	7311	const LoadManifestOptions = struct {
7306	root_name: []const u8,	7312	root_name: []const u8,
7307	dir: fs.Dir,	7313	dir: Io.Dir,
7308	color: Color,	7314	color: Color,
7309	};	7315	};
7310		7316
7311	fn loadManifest(	7317	fn loadManifest(
7312	gpa: Allocator,	7318	gpa: Allocator,
7313	arena: Allocator,	7319	arena: Allocator,
		7320	io: Io,
7314	options: LoadManifestOptions,	7321	options: LoadManifestOptions,
7315	) !struct { Package.Manifest, Ast } {	7322	) !struct { Package.Manifest, Ast } {
7316	const manifest_bytes = while (true) {	7323	const manifest_bytes = while (true) {
...	@@ -7322,7 +7329,7 @@ fn loadManifest(	...	@@ -7322,7 +7329,7 @@ fn loadManifest(
7322	0,	7329	0,
7323	) catch \|err\| switch (err) {	7330	) catch \|err\| switch (err) {
7324	error.FileNotFound => {	7331	error.FileNotFound => {
7325	writeSimpleTemplateFile(Package.Manifest.basename,	7332	writeSimpleTemplateFile(io, Package.Manifest.basename,
7326	\\.{{	7333	\\.{{
7327	\\ .name = .{s},	7334	\\ .name = .{s},
7328	\\ .version = "{s}",	7335	\\ .version = "{s}",
...	@@ -7374,12 +7381,12 @@ fn loadManifest(	...	@@ -7374,12 +7381,12 @@ fn loadManifest(
7374		7381
7375	const Templates = struct {	7382	const Templates = struct {
7376	zig_lib_directory: Cache.Directory,	7383	zig_lib_directory: Cache.Directory,
7377	dir: fs.Dir,	7384	dir: Io.Dir,
7378	buffer: std.array_list.Managed(u8),	7385	buffer: std.array_list.Managed(u8),
7379		7386
7380	fn deinit(templates: *Templates) void {	7387	fn deinit(templates: *Templates, io: Io) void {
7381	templates.zig_lib_directory.handle.close();	7388	templates.zig_lib_directory.handle.close(io);
7382	templates.dir.close();	7389	templates.dir.close(io);
7383	templates.buffer.deinit();	7390	templates.buffer.deinit();
7384	templates.* = undefined;	7391	templates.* = undefined;
7385	}	7392	}
...	@@ -7387,7 +7394,7 @@ const Templates = struct {	...	@@ -7387,7 +7394,7 @@ const Templates = struct {
7387	fn write(	7394	fn write(
7388	templates: *Templates,	7395	templates: *Templates,
7389	arena: Allocator,	7396	arena: Allocator,
7390	out_dir: fs.Dir,	7397	out_dir: Io.Dir,
7391	root_name: []const u8,	7398	root_name: []const u8,
7392	template_path: []const u8,	7399	template_path: []const u8,
7393	fingerprint: Package.Fingerprint,	7400	fingerprint: Package.Fingerprint,
...	@@ -7435,23 +7442,23 @@ const Templates = struct {	...	@@ -7435,23 +7442,23 @@ const Templates = struct {
7435	});	7442	});
7436	}	7443	}
7437	};	7444	};
7438	fn writeSimpleTemplateFile(file_name: []const u8, comptime fmt: []const u8, args: anytype) !void {	7445	fn writeSimpleTemplateFile(io: Io, file_name: []const u8, comptime fmt: []const u8, args: anytype) !void {
7439	const f = try fs.cwd().createFile(file_name, .{ .exclusive = true });	7446	const f = try fs.cwd().createFile(file_name, .{ .exclusive = true });
7440	defer f.close();	7447	defer f.close(io);
7441	var buf: [4096]u8 = undefined;	7448	var buf: [4096]u8 = undefined;
7442	var fw = f.writer(&buf);	7449	var fw = f.writer(&buf);
7443	try fw.interface.print(fmt, args);	7450	try fw.interface.print(fmt, args);
7444	try fw.interface.flush();	7451	try fw.interface.flush();
7445	}	7452	}
7446		7453
7447	fn findTemplates(gpa: Allocator, arena: Allocator) Templates {	7454	fn findTemplates(gpa: Allocator, arena: Allocator, io: Io) Templates {
7448	const cwd_path = introspect.getResolvedCwd(arena) catch \|err\| {	7455	const cwd_path = introspect.getResolvedCwd(arena) catch \|err\| {
7449	fatal("unable to get cwd: {s}", .{@errorName(err)});	7456	fatal("unable to get cwd: {s}", .{@errorName(err)});
7450	};	7457	};
7451	const self_exe_path = fs.selfExePathAlloc(arena) catch \|err\| {	7458	const self_exe_path = fs.selfExePathAlloc(arena) catch \|err\| {
7452	fatal("unable to find self exe path: {s}", .{@errorName(err)});	7459	fatal("unable to find self exe path: {s}", .{@errorName(err)});
7453	};	7460	};
7454	var zig_lib_directory = introspect.findZigLibDirFromSelfExe(arena, cwd_path, self_exe_path) catch \|err\| {	7461	var zig_lib_directory = introspect.findZigLibDirFromSelfExe(arena, io, cwd_path, self_exe_path) catch \|err\| {
7455	fatal("unable to find zig installation directory '{s}': {s}", .{ self_exe_path, @errorName(err) });	7462	fatal("unable to find zig installation directory '{s}': {s}", .{ self_exe_path, @errorName(err) });
7456	};	7463	};
7457		7464

src/print_targets.zig+2-1

...	@@ -12,6 +12,7 @@ const introspect = @import("introspect.zig");	...	@@ -12,6 +12,7 @@ const introspect = @import("introspect.zig");
12		12
13	pub fn cmdTargets(	13	pub fn cmdTargets(
14	allocator: Allocator,	14	allocator: Allocator,
		15	io: Io,
15	args: []const []const u8,	16	args: []const []const u8,
16	out: *std.Io.Writer,	17	out: *std.Io.Writer,
17	native_target: *const Target,	18	native_target: *const Target,
...	@@ -20,7 +21,7 @@ pub fn cmdTargets(	...	@@ -20,7 +21,7 @@ pub fn cmdTargets(
20	var zig_lib_directory = introspect.findZigLibDir(allocator) catch \|err\| {	21	var zig_lib_directory = introspect.findZigLibDir(allocator) catch \|err\| {
21	fatal("unable to find zig installation directory: {s}\n", .{@errorName(err)});	22	fatal("unable to find zig installation directory: {s}\n", .{@errorName(err)});
22	};	23	};
23	defer zig_lib_directory.handle.close();	24	defer zig_lib_directory.handle.close(io);
24	defer allocator.free(zig_lib_directory.path.?);	25	defer allocator.free(zig_lib_directory.path.?);
25		26
26	const abilists_contents = zig_lib_directory.handle.readFileAlloc(	27	const abilists_contents = zig_lib_directory.handle.readFileAlloc(

author	Andrew Kelley <andrew@ziglang.org> 2025-12-05 19:08:37-08:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-12-23 22:15:07-08:00
log	aafddc2ea13e40a8262d9378aeca2e097a37ac03
tree	46770e51147a635a43c2e7356e62064466b51c34
parent	eab354b2f5d7242c036523394023e9824be7eca9

...	@@ -1286,6 +1286,8 @@ fn processSource(	...	@@ -1286,6 +1286,8 @@ fn processSource(
1286	d.comp.generated_buf.items.len = 0;	1286	d.comp.generated_buf.items.len = 0;
1287	const prev_total = d.diagnostics.errors;	1287	const prev_total = d.diagnostics.errors;
1288		1288
		1289	const io = d.comp.io;
		1290
1289	var pp = try Preprocessor.initDefault(d.comp);	1291	var pp = try Preprocessor.initDefault(d.comp);
1290	defer pp.deinit();	1292	defer pp.deinit();
1291		1293
...	@@ -1328,7 +1330,7 @@ fn processSource(	...	@@ -1328,7 +1330,7 @@ fn processSource(
1328	return d.fatal("unable to create dependency file '{s}': {s}", .{ path, errorDescription(er) })	1330	return d.fatal("unable to create dependency file '{s}': {s}", .{ path, errorDescription(er) })
1329	else	1331	else
1330	std.fs.File.stdout();	1332	std.fs.File.stdout();
1331	defer if (dep_file_name != null) file.close();	1333	defer if (dep_file_name != null) file.close(io);
1332		1334
1333	var file_writer = file.writer(&writer_buf);	1335	var file_writer = file.writer(&writer_buf);
1334	dep_file.write(&file_writer.interface) catch	1336	dep_file.write(&file_writer.interface) catch
...	@@ -1353,7 +1355,7 @@ fn processSource(	...	@@ -1353,7 +1355,7 @@ fn processSource(
1353	return d.fatal("unable to create output file '{s}': {s}", .{ some, errorDescription(er) })	1355	return d.fatal("unable to create output file '{s}': {s}", .{ some, errorDescription(er) })
1354	else	1356	else
1355	std.fs.File.stdout();	1357	std.fs.File.stdout();
1356	defer if (d.output_name != null) file.close();	1358	defer if (d.output_name != null) file.close(io);
1357		1359
1358	var file_writer = file.writer(&writer_buf);	1360	var file_writer = file.writer(&writer_buf);
1359	pp.prettyPrintTokens(&file_writer.interface, dump_mode) catch	1361	pp.prettyPrintTokens(&file_writer.interface, dump_mode) catch
...	@@ -1404,7 +1406,7 @@ fn processSource(	...	@@ -1404,7 +1406,7 @@ fn processSource(
1404	if (d.only_preprocess_and_compile) {	1406	if (d.only_preprocess_and_compile) {
1405	const out_file = d.comp.cwd.createFile(out_file_name, .{}) catch \|er\|	1407	const out_file = d.comp.cwd.createFile(out_file_name, .{}) catch \|er\|
1406	return d.fatal("unable to create output file '{s}': {s}", .{ out_file_name, errorDescription(er) });	1408	return d.fatal("unable to create output file '{s}': {s}", .{ out_file_name, errorDescription(er) });
1407	defer out_file.close();	1409	defer out_file.close(io);
1408		1410
1409	assembly.writeToFile(out_file) catch \|er\|	1411	assembly.writeToFile(out_file) catch \|er\|
1410	return d.fatal("unable to write to output file '{s}': {s}", .{ out_file_name, errorDescription(er) });	1412	return d.fatal("unable to write to output file '{s}': {s}", .{ out_file_name, errorDescription(er) });
...	@@ -1418,7 +1420,7 @@ fn processSource(	...	@@ -1418,7 +1420,7 @@ fn processSource(
1418	const assembly_out_file_name = try d.getRandomFilename(&assembly_name_buf, ".s");	1420	const assembly_out_file_name = try d.getRandomFilename(&assembly_name_buf, ".s");
1419	const out_file = d.comp.cwd.createFile(assembly_out_file_name, .{}) catch \|er\|	1421	const out_file = d.comp.cwd.createFile(assembly_out_file_name, .{}) catch \|er\|
1420	return d.fatal("unable to create output file '{s}': {s}", .{ assembly_out_file_name, errorDescription(er) });	1422	return d.fatal("unable to create output file '{s}': {s}", .{ assembly_out_file_name, errorDescription(er) });
1421	defer out_file.close();	1423	defer out_file.close(io);
1422	assembly.writeToFile(out_file) catch \|er\|	1424	assembly.writeToFile(out_file) catch \|er\|
1423	return d.fatal("unable to write to output file '{s}': {s}", .{ assembly_out_file_name, errorDescription(er) });	1425	return d.fatal("unable to write to output file '{s}': {s}", .{ assembly_out_file_name, errorDescription(er) });
1424	try d.invokeAssembler(tc, assembly_out_file_name, out_file_name);	1426	try d.invokeAssembler(tc, assembly_out_file_name, out_file_name);
...	@@ -1454,7 +1456,7 @@ fn processSource(	...	@@ -1454,7 +1456,7 @@ fn processSource(
1454		1456
1455	const out_file = d.comp.cwd.createFile(out_file_name, .{}) catch \|er\|	1457	const out_file = d.comp.cwd.createFile(out_file_name, .{}) catch \|er\|
1456	return d.fatal("unable to create output file '{s}': {s}", .{ out_file_name, errorDescription(er) });	1458	return d.fatal("unable to create output file '{s}': {s}", .{ out_file_name, errorDescription(er) });
1457	defer out_file.close();	1459	defer out_file.close(io);
1458		1460
1459	var file_writer = out_file.writer(&writer_buf);	1461	var file_writer = out_file.writer(&writer_buf);
1460	obj.finish(&file_writer.interface) catch	1462	obj.finish(&file_writer.interface) catch

...	@@ -497,6 +497,7 @@ pub fn addBuiltinIncludeDir(tc: *const Toolchain) !void {	...	@@ -497,6 +497,7 @@ pub fn addBuiltinIncludeDir(tc: *const Toolchain) !void {
497	const comp = d.comp;	497	const comp = d.comp;
498	const gpa = comp.gpa;	498	const gpa = comp.gpa;
499	const arena = comp.arena;	499	const arena = comp.arena;
		500	const io = comp.io;
500	try d.includes.ensureUnusedCapacity(gpa, 1);	501	try d.includes.ensureUnusedCapacity(gpa, 1);
501	if (d.resource_dir) \|resource_dir\| {	502	if (d.resource_dir) \|resource_dir\| {
502	const path = try std.fs.path.join(arena, &.{ resource_dir, "include" });	503	const path = try std.fs.path.join(arena, &.{ resource_dir, "include" });
...	@@ -509,7 +510,7 @@ pub fn addBuiltinIncludeDir(tc: *const Toolchain) !void {	...	@@ -509,7 +510,7 @@ pub fn addBuiltinIncludeDir(tc: *const Toolchain) !void {
509	var search_path = d.aro_name;	510	var search_path = d.aro_name;
510	while (std.fs.path.dirname(search_path)) \|dirname\| : (search_path = dirname) {	511	while (std.fs.path.dirname(search_path)) \|dirname\| : (search_path = dirname) {
511	var base_dir = d.comp.cwd.openDir(dirname, .{}) catch continue;	512	var base_dir = d.comp.cwd.openDir(dirname, .{}) catch continue;
512	defer base_dir.close();	513	defer base_dir.close(io);
513		514
514	base_dir.access("include/stddef.h", .{}) catch continue;	515	base_dir.access("include/stddef.h", .{}) catch continue;
515	const path = try std.fs.path.join(arena, &.{ dirname, "include" });	516	const path = try std.fs.path.join(arena, &.{ dirname, "include" });

...	@@ -34,7 +34,7 @@ const code_pages = @import("code_pages.zig");	...	@@ -34,7 +34,7 @@ const code_pages = @import("code_pages.zig");
34	const errors = @import("errors.zig");	34	const errors = @import("errors.zig");
35		35
36	pub const CompileOptions = struct {	36	pub const CompileOptions = struct {
37	cwd: std.fs.Dir,	37	cwd: std.Io.Dir,
38	diagnostics: *Diagnostics,	38	diagnostics: *Diagnostics,
39	source_mappings: ?*SourceMappings = null,	39	source_mappings: ?*SourceMappings = null,
40	/// List of paths (absolute or relative to `cwd`) for every file that the resources within the .rc file depend on.	40	/// List of paths (absolute or relative to `cwd`) for every file that the resources within the .rc file depend on.
...	@@ -107,7 +107,7 @@ pub fn compile(allocator: Allocator, io: Io, source: []const u8, writer: *std.Io	...	@@ -107,7 +107,7 @@ pub fn compile(allocator: Allocator, io: Io, source: []const u8, writer: *std.Io
107	// the cwd so we don't need to add it as a distinct search path.	107	// the cwd so we don't need to add it as a distinct search path.
108	if (std.fs.path.dirname(root_path)) \|root_dir_path\| {	108	if (std.fs.path.dirname(root_path)) \|root_dir_path\| {
109	var root_dir = try options.cwd.openDir(root_dir_path, .{});	109	var root_dir = try options.cwd.openDir(root_dir_path, .{});
110	errdefer root_dir.close();	110	errdefer root_dir.close(io);
111	try search_dirs.append(allocator, .{ .dir = root_dir, .path = try allocator.dupe(u8, root_dir_path) });	111	try search_dirs.append(allocator, .{ .dir = root_dir, .path = try allocator.dupe(u8, root_dir_path) });
112	}	112	}
113	}	113	}
...	@@ -136,7 +136,7 @@ pub fn compile(allocator: Allocator, io: Io, source: []const u8, writer: *std.Io	...	@@ -136,7 +136,7 @@ pub fn compile(allocator: Allocator, io: Io, source: []const u8, writer: *std.Io
136	// TODO: maybe a warning that the search path is skipped?	136	// TODO: maybe a warning that the search path is skipped?
137	continue;	137	continue;
138	};	138	};
139	errdefer dir.close();	139	errdefer dir.close(io);
140	try search_dirs.append(allocator, .{ .dir = dir, .path = try allocator.dupe(u8, extra_include_path) });	140	try search_dirs.append(allocator, .{ .dir = dir, .path = try allocator.dupe(u8, extra_include_path) });
141	}	141	}
142	for (options.system_include_paths) \|system_include_path\| {	142	for (options.system_include_paths) \|system_include_path\| {
...	@@ -144,7 +144,7 @@ pub fn compile(allocator: Allocator, io: Io, source: []const u8, writer: *std.Io	...	@@ -144,7 +144,7 @@ pub fn compile(allocator: Allocator, io: Io, source: []const u8, writer: *std.Io
144	// TODO: maybe a warning that the search path is skipped?	144	// TODO: maybe a warning that the search path is skipped?
145	continue;	145	continue;
146	};	146	};
147	errdefer dir.close();	147	errdefer dir.close(io);
148	try search_dirs.append(allocator, .{ .dir = dir, .path = try allocator.dupe(u8, system_include_path) });	148	try search_dirs.append(allocator, .{ .dir = dir, .path = try allocator.dupe(u8, system_include_path) });
149	}	149	}
150	if (!options.ignore_include_env_var) {	150	if (!options.ignore_include_env_var) {
...	@@ -160,7 +160,7 @@ pub fn compile(allocator: Allocator, io: Io, source: []const u8, writer: *std.Io	...	@@ -160,7 +160,7 @@ pub fn compile(allocator: Allocator, io: Io, source: []const u8, writer: *std.Io
160	var it = std.mem.tokenizeScalar(u8, INCLUDE, delimiter);	160	var it = std.mem.tokenizeScalar(u8, INCLUDE, delimiter);
161	while (it.next()) \|search_path\| {	161	while (it.next()) \|search_path\| {
162	var dir = openSearchPathDir(options.cwd, search_path) catch continue;	162	var dir = openSearchPathDir(options.cwd, search_path) catch continue;
163	errdefer dir.close();	163	errdefer dir.close(io);
164	try search_dirs.append(allocator, .{ .dir = dir, .path = try allocator.dupe(u8, search_path) });	164	try search_dirs.append(allocator, .{ .dir = dir, .path = try allocator.dupe(u8, search_path) });
165	}	165	}
166	}	166	}
...	@@ -196,7 +196,7 @@ pub const Compiler = struct {	...	@@ -196,7 +196,7 @@ pub const Compiler = struct {
196	arena: Allocator,	196	arena: Allocator,
197	allocator: Allocator,	197	allocator: Allocator,
198	io: Io,	198	io: Io,
199	cwd: std.fs.Dir,	199	cwd: std.Io.Dir,
200	state: State = .{},	200	state: State = .{},
201	diagnostics: *Diagnostics,	201	diagnostics: *Diagnostics,
202	dependencies: ?*Dependencies,	202	dependencies: ?*Dependencies,
...	@@ -388,7 +388,9 @@ pub const Compiler = struct {	...	@@ -388,7 +388,9 @@ pub const Compiler = struct {
388	/// matching file is invalid. That is, it does not do the `cmd` PATH searching	388	/// matching file is invalid. That is, it does not do the `cmd` PATH searching
389	/// thing of continuing to look for matching files until it finds a valid	389	/// thing of continuing to look for matching files until it finds a valid
390	/// one if a matching file is invalid.	390	/// one if a matching file is invalid.
391	fn searchForFile(self: *Compiler, path: []const u8) !std.fs.File {	391	fn searchForFile(self: *Compiler, path: []const u8) !std.Io.File {
		392	const io = self.io;
		393
392	// If the path is absolute, then it is not resolved relative to any search	394	// If the path is absolute, then it is not resolved relative to any search
393	// paths, so there's no point in checking them.	395	// paths, so there's no point in checking them.
394	//	396	//
...	@@ -405,7 +407,7 @@ pub const Compiler = struct {	...	@@ -405,7 +407,7 @@ pub const Compiler = struct {
405	// an absolute path.	407	// an absolute path.
406	if (std.fs.path.isAbsolute(path)) {	408	if (std.fs.path.isAbsolute(path)) {
407	const file = try utils.openFileNotDir(std.fs.cwd(), path, .{});	409	const file = try utils.openFileNotDir(std.fs.cwd(), path, .{});
408	errdefer file.close();	410	errdefer file.close(io);
409		411
410	if (self.dependencies) \|dependencies\| {	412	if (self.dependencies) \|dependencies\| {
411	const duped_path = try dependencies.allocator.dupe(u8, path);	413	const duped_path = try dependencies.allocator.dupe(u8, path);
...	@@ -414,10 +416,10 @@ pub const Compiler = struct {	...	@@ -414,10 +416,10 @@ pub const Compiler = struct {
414	}	416	}
415	}	417	}
416		418
417	var first_error: ?(std.fs.File.OpenError \|\| std.fs.File.StatError) = null;	419	var first_error: ?(std.Io.File.OpenError \|\| std.Io.File.StatError) = null;
418	for (self.search_dirs) \|search_dir\| {	420	for (self.search_dirs) \|search_dir\| {
419	if (utils.openFileNotDir(search_dir.dir, path, .{})) \|file\| {	421	if (utils.openFileNotDir(search_dir.dir, path, .{})) \|file\| {
420	errdefer file.close();	422	errdefer file.close(io);
421		423
422	if (self.dependencies) \|dependencies\| {	424	if (self.dependencies) \|dependencies\| {
423	const searched_file_path = try std.fs.path.join(dependencies.allocator, &.{	425	const searched_file_path = try std.fs.path.join(dependencies.allocator, &.{
...	@@ -587,7 +589,7 @@ pub const Compiler = struct {	...	@@ -587,7 +589,7 @@ pub const Compiler = struct {
587	});	589	});
588	},	590	},
589	};	591	};
590	defer file_handle.close();	592	defer file_handle.close(io);
591	var file_buffer: [2048]u8 = undefined;	593	var file_buffer: [2048]u8 = undefined;
592	var file_reader = file_handle.reader(io, &file_buffer);	594	var file_reader = file_handle.reader(io, &file_buffer);
593		595
...	@@ -2892,9 +2894,9 @@ pub const Compiler = struct {	...	@@ -2892,9 +2894,9 @@ pub const Compiler = struct {
2892	}	2894	}
2893	};	2895	};
2894		2896
2895	pub const OpenSearchPathError = std.fs.Dir.OpenError;	2897	pub const OpenSearchPathError = std.Io.Dir.OpenError;
2896		2898
2897	fn openSearchPathDir(dir: std.fs.Dir, path: []const u8) OpenSearchPathError!std.fs.Dir {	2899	fn openSearchPathDir(dir: std.Io.Dir, path: []const u8) OpenSearchPathError!std.Io.Dir {
2898	// Validate the search path to avoid possible unreachable on invalid paths,	2900	// Validate the search path to avoid possible unreachable on invalid paths,
2899	// see https://github.com/ziglang/zig/issues/15607 for why this is currently necessary.	2901	// see https://github.com/ziglang/zig/issues/15607 for why this is currently necessary.
2900	try validateSearchPath(path);	2902	try validateSearchPath(path);
...	@@ -2927,11 +2929,11 @@ fn validateSearchPath(path: []const u8) error{BadPathName}!void {	...	@@ -2927,11 +2929,11 @@ fn validateSearchPath(path: []const u8) error{BadPathName}!void {
2927	}	2929	}
2928		2930
2929	pub const SearchDir = struct {	2931	pub const SearchDir = struct {
2930	dir: std.fs.Dir,	2932	dir: std.Io.Dir,
2931	path: ?[]const u8,	2933	path: ?[]const u8,
2932		2934
2933	pub fn deinit(self: *SearchDir, allocator: Allocator) void {	2935	pub fn deinit(self: *SearchDir, allocator: Allocator, io: Io) void {
2934	self.dir.close();	2936	self.dir.close(io);
2935	if (self.path) \|path\| {	2937	if (self.path) \|path\| {
2936	allocator.free(path);	2938	allocator.free(path);
2937	}	2939	}

...	@@ -121,6 +121,7 @@ pub const usage =	...	@@ -121,6 +121,7 @@ pub const usage =
121		121
122	fn translate(d: aro.Driver, tc: aro.Toolchain, args: [][:0]u8, zig_integration: bool) !void {	122	fn translate(d: aro.Driver, tc: aro.Toolchain, args: [][:0]u8, zig_integration: bool) !void {
123	const gpa = d.comp.gpa;	123	const gpa = d.comp.gpa;
		124	const io = d.comp.io;
124		125
125	const aro_args = args: {	126	const aro_args = args: {
126	var i: usize = 0;	127	var i: usize = 0;
...	@@ -228,7 +229,7 @@ fn translate(d: aro.Driver, tc: aro.Toolchain, args: [][:0]u8, zig_integration	...	@@ -228,7 +229,7 @@ fn translate(d: aro.Driver, tc: aro.Toolchain, args: [][:0]u8, zig_integration
228	return d.fatal("unable to create dependency file '{s}': {s}", .{ path, aro.Driver.errorDescription(er) })	229	return d.fatal("unable to create dependency file '{s}': {s}", .{ path, aro.Driver.errorDescription(er) })
229	else	230	else
230	std.fs.File.stdout();	231	std.fs.File.stdout();
231	defer if (dep_file_name != null) file.close();	232	defer if (dep_file_name != null) file.close(io);
232		233
233	var file_writer = file.writer(&out_buf);	234	var file_writer = file.writer(&out_buf);
234	dep_file.write(&file_writer.interface) catch	235	dep_file.write(&file_writer.interface) catch
...	@@ -246,7 +247,7 @@ fn translate(d: aro.Driver, tc: aro.Toolchain, args: [][:0]u8, zig_integration	...	@@ -246,7 +247,7 @@ fn translate(d: aro.Driver, tc: aro.Toolchain, args: [][:0]u8, zig_integration
246	var close_out_file = false;	247	var close_out_file = false;
247	var out_file_path: []const u8 = "<stdout>";	248	var out_file_path: []const u8 = "<stdout>";
248	var out_file: std.fs.File = .stdout();	249	var out_file: std.fs.File = .stdout();
249	defer if (close_out_file) out_file.close();	250	defer if (close_out_file) out_file.close(io);
250		251
251	if (d.output_name) \|path\| blk: {	252	if (d.output_name) \|path\| blk: {
252	if (std.mem.eql(u8, path, "-")) break :blk;	253	if (std.mem.eql(u8, path, "-")) break :blk;

...	@@ -206,7 +206,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {	...	@@ -206,7 +206,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
206	}	206	}
207	}	207	}
208		208
209	const open_dir_cache = try arena.alloc(fs.Dir, write_file.directories.items.len);	209	const open_dir_cache = try arena.alloc(Io.Dir, write_file.directories.items.len);
210	var open_dirs_count: usize = 0;	210	var open_dirs_count: usize = 0;
211	defer closeDirs(open_dir_cache[0..open_dirs_count]);	211	defer closeDirs(open_dir_cache[0..open_dirs_count]);
212		212
...	@@ -264,7 +264,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {	...	@@ -264,7 +264,7 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
264	b.cache_root, cache_path, @errorName(err),	264	b.cache_root, cache_path, @errorName(err),
265	});	265	});
266	};	266	};
267	defer cache_dir.close();	267	defer cache_dir.close(io);
268		268
269	for (write_file.files.items) \|file\| {	269	for (write_file.files.items) \|file\| {
270	if (fs.path.dirname(file.sub_path)) \|dirname\| {	270	if (fs.path.dirname(file.sub_path)) \|dirname\| {
...	@@ -342,6 +342,8 @@ fn make(step: *Step, options: Step.MakeOptions) !void {	...	@@ -342,6 +342,8 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
342	try step.writeManifest(&man);	342	try step.writeManifest(&man);
343	}	343	}
344		344
345	fn closeDirs(dirs: []fs.Dir) void {	345	fn closeDirs(io: Io, dirs: []Io.Dir) void {
346	for (dirs) \|*d\| d.close();	346	var group: Io.Group = .init;
		347	defer group.wait();
		348	for (dirs) \|d\| group.async(Io.Dir.close, .{ d, io });
347	}	349	}

...	@@ -2835,7 +2835,7 @@ test "discarding sendFile" {	...	@@ -2835,7 +2835,7 @@ test "discarding sendFile" {
2835	defer tmp_dir.cleanup();	2835	defer tmp_dir.cleanup();
2836		2836
2837	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });	2837	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });
2838	defer file.close();	2838	defer file.close(io);
2839	var r_buffer: [256]u8 = undefined;	2839	var r_buffer: [256]u8 = undefined;
2840	var file_writer: std.fs.File.Writer = .init(file, &r_buffer);	2840	var file_writer: std.fs.File.Writer = .init(file, &r_buffer);
2841	try file_writer.interface.writeByte('h');	2841	try file_writer.interface.writeByte('h');
...	@@ -2857,7 +2857,7 @@ test "allocating sendFile" {	...	@@ -2857,7 +2857,7 @@ test "allocating sendFile" {
2857	defer tmp_dir.cleanup();	2857	defer tmp_dir.cleanup();
2858		2858
2859	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });	2859	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });
2860	defer file.close();	2860	defer file.close(io);
2861	var r_buffer: [2]u8 = undefined;	2861	var r_buffer: [2]u8 = undefined;
2862	var file_writer: std.fs.File.Writer = .init(file, &r_buffer);	2862	var file_writer: std.fs.File.Writer = .init(file, &r_buffer);
2863	try file_writer.interface.writeAll("abcd");	2863	try file_writer.interface.writeAll("abcd");
...	@@ -2881,7 +2881,7 @@ test sendFileReading {	...	@@ -2881,7 +2881,7 @@ test sendFileReading {
2881	defer tmp_dir.cleanup();	2881	defer tmp_dir.cleanup();
2882		2882
2883	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });	2883	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });
2884	defer file.close();	2884	defer file.close(io);
2885	var r_buffer: [2]u8 = undefined;	2885	var r_buffer: [2]u8 = undefined;
2886	var file_writer: std.fs.File.Writer = .init(file, &r_buffer);	2886	var file_writer: std.fs.File.Writer = .init(file, &r_buffer);
2887	try file_writer.interface.writeAll("abcd");	2887	try file_writer.interface.writeAll("abcd");

...	@@ -7,6 +7,7 @@ const target = builtin.target;	...	@@ -7,6 +7,7 @@ const target = builtin.target;
7	const native_os = builtin.os.tag;	7	const native_os = builtin.os.tag;
8		8
9	const std = @import("std.zig");	9	const std = @import("std.zig");
		10	const Io = std.Io;
10	const math = std.math;	11	const math = std.math;
11	const assert = std.debug.assert;	12	const assert = std.debug.assert;
12	const posix = std.posix;	13	const posix = std.posix;
...	@@ -176,7 +177,7 @@ pub const SetNameError = error{	...	@@ -176,7 +177,7 @@ pub const SetNameError = error{
176	InvalidWtf8,	177	InvalidWtf8,
177	} \|\| posix.PrctlError \|\| posix.WriteError \|\| std.fs.File.OpenError \|\| std.fmt.BufPrintError;	178	} \|\| posix.PrctlError \|\| posix.WriteError \|\| std.fs.File.OpenError \|\| std.fmt.BufPrintError;
178		179
179	pub fn setName(self: Thread, name: []const u8) SetNameError!void {	180	pub fn setName(self: Thread, io: Io, name: []const u8) SetNameError!void {
180	if (name.len > max_name_len) return error.NameTooLong;	181	if (name.len > max_name_len) return error.NameTooLong;
181		182
182	const name_with_terminator = blk: {	183	const name_with_terminator = blk: {
...	@@ -208,7 +209,7 @@ pub fn setName(self: Thread, name: []const u8) SetNameError!void {	...	@@ -208,7 +209,7 @@ pub fn setName(self: Thread, name: []const u8) SetNameError!void {
208	const path = try std.fmt.bufPrint(&buf, "/proc/self/task/{d}/comm", .{self.getHandle()});	209	const path = try std.fmt.bufPrint(&buf, "/proc/self/task/{d}/comm", .{self.getHandle()});
209		210
210	const file = try std.fs.cwd().openFile(path, .{ .mode = .write_only });	211	const file = try std.fs.cwd().openFile(path, .{ .mode = .write_only });
211	defer file.close();	212	defer file.close(io);
212		213
213	try file.writeAll(name);	214	try file.writeAll(name);
214	return;	215	return;
...	@@ -325,7 +326,7 @@ pub fn getName(self: Thread, buffer_ptr: *[max_name_len:0]u8) GetNameError!?[]co	...	@@ -325,7 +326,7 @@ pub fn getName(self: Thread, buffer_ptr: *[max_name_len:0]u8) GetNameError!?[]co
325	const io = threaded.ioBasic();	326	const io = threaded.ioBasic();
326		327
327	const file = try std.fs.cwd().openFile(path, .{});	328	const file = try std.fs.cwd().openFile(path, .{});
328	defer file.close();	329	defer file.close(io);
329		330
330	var file_reader = file.readerStreaming(io, &.{});	331	var file_reader = file.readerStreaming(io, &.{});
331	const data_len = file_reader.interface.readSliceShort(buffer_ptr[0 .. max_name_len + 1]) catch \|err\| switch (err) {	332	const data_len = file_reader.interface.readSliceShort(buffer_ptr[0 .. max_name_len + 1]) catch \|err\| switch (err) {

...	@@ -181,7 +181,7 @@ pub fn addCertsFromDirPath(	...	@@ -181,7 +181,7 @@ pub fn addCertsFromDirPath(
181	sub_dir_path: []const u8,	181	sub_dir_path: []const u8,
182	) AddCertsFromDirPathError!void {	182	) AddCertsFromDirPathError!void {
183	var iterable_dir = try dir.openDir(sub_dir_path, .{ .iterate = true });	183	var iterable_dir = try dir.openDir(sub_dir_path, .{ .iterate = true });
184	defer iterable_dir.close();	184	defer iterable_dir.close(io);
185	return addCertsFromDir(cb, gpa, io, iterable_dir);	185	return addCertsFromDir(cb, gpa, io, iterable_dir);
186	}	186	}
187		187
...	@@ -194,7 +194,7 @@ pub fn addCertsFromDirPathAbsolute(	...	@@ -194,7 +194,7 @@ pub fn addCertsFromDirPathAbsolute(
194	) AddCertsFromDirPathError!void {	194	) AddCertsFromDirPathError!void {
195	assert(fs.path.isAbsolute(abs_dir_path));	195	assert(fs.path.isAbsolute(abs_dir_path));
196	var iterable_dir = try fs.openDirAbsolute(abs_dir_path, .{ .iterate = true });	196	var iterable_dir = try fs.openDirAbsolute(abs_dir_path, .{ .iterate = true });
197	defer iterable_dir.close();	197	defer iterable_dir.close(io);
198	return addCertsFromDir(cb, gpa, io, now, iterable_dir);	198	return addCertsFromDir(cb, gpa, io, now, iterable_dir);
199	}	199	}
200		200
...	@@ -222,7 +222,7 @@ pub fn addCertsFromFilePathAbsolute(	...	@@ -222,7 +222,7 @@ pub fn addCertsFromFilePathAbsolute(
222	abs_file_path: []const u8,	222	abs_file_path: []const u8,
223	) AddCertsFromFilePathError!void {	223	) AddCertsFromFilePathError!void {
224	var file = try fs.openFileAbsolute(abs_file_path, .{});	224	var file = try fs.openFileAbsolute(abs_file_path, .{});
225	defer file.close();	225	defer file.close(io);
226	var file_reader = file.reader(io, &.{});	226	var file_reader = file.reader(io, &.{});
227	return addCertsFromFile(cb, gpa, &file_reader, now.toSeconds());	227	return addCertsFromFile(cb, gpa, &file_reader, now.toSeconds());
228	}	228	}

...	@@ -1298,7 +1298,7 @@ test printLineFromFile {	...	@@ -1298,7 +1298,7 @@ test printLineFromFile {
1298	}	1298	}
1299	{	1299	{
1300	const file = try test_dir.dir.createFile("line_overlaps_page_boundary.zig", .{});	1300	const file = try test_dir.dir.createFile("line_overlaps_page_boundary.zig", .{});
1301	defer file.close();	1301	defer file.close(io);
1302	const path = try fs.path.join(gpa, &.{ test_dir_path, "line_overlaps_page_boundary.zig" });	1302	const path = try fs.path.join(gpa, &.{ test_dir_path, "line_overlaps_page_boundary.zig" });
1303	defer gpa.free(path);	1303	defer gpa.free(path);
1304		1304
...	@@ -1317,7 +1317,7 @@ test printLineFromFile {	...	@@ -1317,7 +1317,7 @@ test printLineFromFile {
1317	}	1317	}
1318	{	1318	{
1319	const file = try test_dir.dir.createFile("file_ends_on_page_boundary.zig", .{});	1319	const file = try test_dir.dir.createFile("file_ends_on_page_boundary.zig", .{});
1320	defer file.close();	1320	defer file.close(io);
1321	const path = try fs.path.join(gpa, &.{ test_dir_path, "file_ends_on_page_boundary.zig" });	1321	const path = try fs.path.join(gpa, &.{ test_dir_path, "file_ends_on_page_boundary.zig" });
1322	defer gpa.free(path);	1322	defer gpa.free(path);
1323		1323
...	@@ -1331,7 +1331,7 @@ test printLineFromFile {	...	@@ -1331,7 +1331,7 @@ test printLineFromFile {
1331	}	1331	}
1332	{	1332	{
1333	const file = try test_dir.dir.createFile("very_long_first_line_spanning_multiple_pages.zig", .{});	1333	const file = try test_dir.dir.createFile("very_long_first_line_spanning_multiple_pages.zig", .{});
1334	defer file.close();	1334	defer file.close(io);
1335	const path = try fs.path.join(gpa, &.{ test_dir_path, "very_long_first_line_spanning_multiple_pages.zig" });	1335	const path = try fs.path.join(gpa, &.{ test_dir_path, "very_long_first_line_spanning_multiple_pages.zig" });
1336	defer gpa.free(path);	1336	defer gpa.free(path);
1337		1337
...	@@ -1357,7 +1357,7 @@ test printLineFromFile {	...	@@ -1357,7 +1357,7 @@ test printLineFromFile {
1357	}	1357	}
1358	{	1358	{
1359	const file = try test_dir.dir.createFile("file_of_newlines.zig", .{});	1359	const file = try test_dir.dir.createFile("file_of_newlines.zig", .{});
1360	defer file.close();	1360	defer file.close(io);
1361	const path = try fs.path.join(gpa, &.{ test_dir_path, "file_of_newlines.zig" });	1361	const path = try fs.path.join(gpa, &.{ test_dir_path, "file_of_newlines.zig" });
1362	defer gpa.free(path);	1362	defer gpa.free(path);
1363		1363

...	@@ -27,13 +27,13 @@ pub fn deinit(mf: *MachOFile, gpa: Allocator) void {	...	@@ -27,13 +27,13 @@ pub fn deinit(mf: *MachOFile, gpa: Allocator) void {
27	posix.munmap(mf.mapped_memory);	27	posix.munmap(mf.mapped_memory);
28	}	28	}
29		29
30	pub fn load(gpa: Allocator, path: []const u8, arch: std.Target.Cpu.Arch) Error!MachOFile {	30	pub fn load(gpa: Allocator, io: Io, path: []const u8, arch: std.Target.Cpu.Arch) Error!MachOFile {
31	switch (arch) {	31	switch (arch) {
32	.x86_64, .aarch64 => {},	32	.x86_64, .aarch64 => {},
33	else => unreachable,	33	else => unreachable,
34	}	34	}
35		35
36	const all_mapped_memory = try mapDebugInfoFile(path);	36	const all_mapped_memory = try mapDebugInfoFile(io, path);
37	errdefer posix.munmap(all_mapped_memory);	37	errdefer posix.munmap(all_mapped_memory);
38		38
39	// In most cases, the file we just mapped is a Mach-O binary. However, it could be a "universal	39	// In most cases, the file we just mapped is a Mach-O binary. However, it could be a "universal
...	@@ -239,7 +239,7 @@ pub fn load(gpa: Allocator, path: []const u8, arch: std.Target.Cpu.Arch) Error!M	...	@@ -239,7 +239,7 @@ pub fn load(gpa: Allocator, path: []const u8, arch: std.Target.Cpu.Arch) Error!M
239	.text_vmaddr = text_vmaddr,	239	.text_vmaddr = text_vmaddr,
240	};	240	};
241	}	241	}
242	pub fn getDwarfForAddress(mf: MachOFile, gpa: Allocator, vaddr: u64) !struct { Dwarf, u64 } {	242	pub fn getDwarfForAddress(mf: MachOFile, gpa: Allocator, io: Io, vaddr: u64) !struct { Dwarf, u64 } {
243	const symbol = Symbol.find(mf.symbols, vaddr) orelse return error.MissingDebugInfo;	243	const symbol = Symbol.find(mf.symbols, vaddr) orelse return error.MissingDebugInfo;
244		244
245	if (symbol.ofile == Symbol.unknown_ofile) return error.MissingDebugInfo;	245	if (symbol.ofile == Symbol.unknown_ofile) return error.MissingDebugInfo;
...	@@ -254,7 +254,7 @@ pub fn getDwarfForAddress(mf: *MachOFile, gpa: Allocator, vaddr: u64) !struct {	...	@@ -254,7 +254,7 @@ pub fn getDwarfForAddress(mf: *MachOFile, gpa: Allocator, vaddr: u64) !struct {
254	const gop = try mf.ofiles.getOrPut(gpa, symbol.ofile);	254	const gop = try mf.ofiles.getOrPut(gpa, symbol.ofile);
255	if (!gop.found_existing) {	255	if (!gop.found_existing) {
256	const name = mem.sliceTo(mf.strings[symbol.ofile..], 0);	256	const name = mem.sliceTo(mf.strings[symbol.ofile..], 0);
257	gop.value_ptr.* = loadOFile(gpa, name);	257	gop.value_ptr.* = loadOFile(gpa, io, name);
258	}	258	}
259	const of = &(gop.value_ptr.* catch \|err\| return err);	259	const of = &(gop.value_ptr.* catch \|err\| return err);
260		260
...	@@ -356,7 +356,7 @@ test {	...	@@ -356,7 +356,7 @@ test {
356	_ = Symbol;	356	_ = Symbol;
357	}	357	}
358		358
359	fn loadOFile(gpa: Allocator, o_file_name: []const u8) !OFile {	359	fn loadOFile(gpa: Allocator, io: Io, o_file_name: []const u8) !OFile {
360	const all_mapped_memory, const mapped_ofile = map: {	360	const all_mapped_memory, const mapped_ofile = map: {
361	const open_paren = paren: {	361	const open_paren = paren: {
362	if (std.mem.endsWith(u8, o_file_name, ")")) {	362	if (std.mem.endsWith(u8, o_file_name, ")")) {
...	@@ -365,7 +365,7 @@ fn loadOFile(gpa: Allocator, o_file_name: []const u8) !OFile {	...	@@ -365,7 +365,7 @@ fn loadOFile(gpa: Allocator, o_file_name: []const u8) !OFile {
365	}	365	}
366	}	366	}
367	// Not an archive, just a normal path to a .o file	367	// Not an archive, just a normal path to a .o file
368	const m = try mapDebugInfoFile(o_file_name);	368	const m = try mapDebugInfoFile(io, o_file_name);
369	break :map .{ m, m };	369	break :map .{ m, m };
370	};	370	};
371		371
...	@@ -373,7 +373,7 @@ fn loadOFile(gpa: Allocator, o_file_name: []const u8) !OFile {	...	@@ -373,7 +373,7 @@ fn loadOFile(gpa: Allocator, o_file_name: []const u8) !OFile {
373		373
374	const archive_path = o_file_name[0..open_paren];	374	const archive_path = o_file_name[0..open_paren];
375	const target_name_in_archive = o_file_name[open_paren + 1 .. o_file_name.len - 1];	375	const target_name_in_archive = o_file_name[open_paren + 1 .. o_file_name.len - 1];
376	const mapped_archive = try mapDebugInfoFile(archive_path);	376	const mapped_archive = try mapDebugInfoFile(io, archive_path);
377	errdefer posix.munmap(mapped_archive);	377	errdefer posix.munmap(mapped_archive);
378		378
379	var ar_reader: Io.Reader = .fixed(mapped_archive);	379	var ar_reader: Io.Reader = .fixed(mapped_archive);
...	@@ -511,12 +511,12 @@ fn loadOFile(gpa: Allocator, o_file_name: []const u8) !OFile {	...	@@ -511,12 +511,12 @@ fn loadOFile(gpa: Allocator, o_file_name: []const u8) !OFile {
511	}	511	}
512		512
513	/// Uses `mmap` to map the file at `path` into memory.	513	/// Uses `mmap` to map the file at `path` into memory.
514	fn mapDebugInfoFile(path: []const u8) ![]align(std.heap.page_size_min) const u8 {	514	fn mapDebugInfoFile(io: Io, path: []const u8) ![]align(std.heap.page_size_min) const u8 {
515	const file = std.fs.cwd().openFile(path, .{}) catch \|err\| switch (err) {	515	const file = std.fs.cwd().openFile(path, .{}) catch \|err\| switch (err) {
516	error.FileNotFound => return error.MissingDebugInfo,	516	error.FileNotFound => return error.MissingDebugInfo,
517	else => return error.ReadFailed,	517	else => return error.ReadFailed,
518	};	518	};
519	defer file.close();	519	defer file.close(io);
520		520
521	const file_len = std.math.cast(	521	const file_len = std.math.cast(
522	usize,	522	usize,

...	@@ -319,14 +319,14 @@ const Module = struct {	...	@@ -319,14 +319,14 @@ const Module = struct {
319	}	319	}
320		320
321	/// Assumes we already hold an exclusive lock.	321	/// Assumes we already hold an exclusive lock.
322	fn getLoadedElf(mod: Module, gpa: Allocator) Error!LoadedElf {	322	fn getLoadedElf(mod: Module, gpa: Allocator, io: Io) Error!LoadedElf {
323	if (mod.loaded_elf == null) mod.loaded_elf = loadElf(mod, gpa);	323	if (mod.loaded_elf == null) mod.loaded_elf = loadElf(mod, gpa, io);
324	return if (mod.loaded_elf.?) \|*elf\| elf else \|err\| err;	324	return if (mod.loaded_elf.?) \|*elf\| elf else \|err\| err;
325	}	325	}
326	fn loadElf(mod: *Module, gpa: Allocator) Error!LoadedElf {	326	fn loadElf(mod: *Module, gpa: Allocator, io: Io) Error!LoadedElf {
327	const load_result = if (mod.name.len > 0) res: {	327	const load_result = if (mod.name.len > 0) res: {
328	var file = std.fs.cwd().openFile(mod.name, .{}) catch return error.MissingDebugInfo;	328	var file = std.fs.cwd().openFile(mod.name, .{}) catch return error.MissingDebugInfo;
329	defer file.close();	329	defer file.close(io);
330	break :res std.debug.ElfFile.load(gpa, file, mod.build_id, &.native(mod.name));	330	break :res std.debug.ElfFile.load(gpa, file, mod.build_id, &.native(mod.name));
331	} else res: {	331	} else res: {
332	const path = std.fs.selfExePathAlloc(gpa) catch \|err\| switch (err) {	332	const path = std.fs.selfExePathAlloc(gpa) catch \|err\| switch (err) {
...	@@ -335,7 +335,7 @@ const Module = struct {	...	@@ -335,7 +335,7 @@ const Module = struct {
335	};	335	};
336	defer gpa.free(path);	336	defer gpa.free(path);
337	var file = std.fs.cwd().openFile(path, .{}) catch return error.MissingDebugInfo;	337	var file = std.fs.cwd().openFile(path, .{}) catch return error.MissingDebugInfo;
338	defer file.close();	338	defer file.close(io);
339	break :res std.debug.ElfFile.load(gpa, file, mod.build_id, &.native(path));	339	break :res std.debug.ElfFile.load(gpa, file, mod.build_id, &.native(path));
340	};	340	};
341		341

...	@@ -207,11 +207,11 @@ const Module = struct {	...	@@ -207,11 +207,11 @@ const Module = struct {
207	file: fs.File,	207	file: fs.File,
208	section_handle: windows.HANDLE,	208	section_handle: windows.HANDLE,
209	section_view: []const u8,	209	section_view: []const u8,
210	fn deinit(mf: *const MappedFile) void {	210	fn deinit(mf: *const MappedFile, io: Io) void {
211	const process_handle = windows.GetCurrentProcess();	211	const process_handle = windows.GetCurrentProcess();
212	assert(windows.ntdll.NtUnmapViewOfSection(process_handle, @constCast(mf.section_view.ptr)) == .SUCCESS);	212	assert(windows.ntdll.NtUnmapViewOfSection(process_handle, @constCast(mf.section_view.ptr)) == .SUCCESS);
213	windows.CloseHandle(mf.section_handle);	213	windows.CloseHandle(mf.section_handle);
214	mf.file.close();	214	mf.file.close(io);
215	}	215	}
216	};	216	};
217		217
...	@@ -447,7 +447,7 @@ const Module = struct {	...	@@ -447,7 +447,7 @@ const Module = struct {
447	error.FileNotFound, error.IsDir => break :pdb null,	447	error.FileNotFound, error.IsDir => break :pdb null,
448	else => return error.ReadFailed,	448	else => return error.ReadFailed,
449	};	449	};
450	errdefer pdb_file.close();	450	errdefer pdb_file.close(io);
451		451
452	const pdb_reader = try arena.create(Io.File.Reader);	452	const pdb_reader = try arena.create(Io.File.Reader);
453	pdb_reader.* = pdb_file.reader(io, try arena.alloc(u8, 4096));	453	pdb_reader.* = pdb_file.reader(io, try arena.alloc(u8, 4096));

...	@@ -613,9 +613,9 @@ pub const TmpDir = struct {	...	@@ -613,9 +613,9 @@ pub const TmpDir = struct {
613	const sub_path_len = std.fs.base64_encoder.calcSize(random_bytes_count);	613	const sub_path_len = std.fs.base64_encoder.calcSize(random_bytes_count);
614		614
615	pub fn cleanup(self: *TmpDir) void {	615	pub fn cleanup(self: *TmpDir) void {
616	self.dir.close();	616	self.dir.close(io);
617	self.parent_dir.deleteTree(&self.sub_path) catch {};	617	self.parent_dir.deleteTree(&self.sub_path) catch {};
618	self.parent_dir.close();	618	self.parent_dir.close(io);
619	self.* = undefined;	619	self.* = undefined;
620	}	620	}
621	};	621	};
...	@@ -629,7 +629,7 @@ pub fn tmpDir(opts: std.fs.Dir.OpenOptions) TmpDir {	...	@@ -629,7 +629,7 @@ pub fn tmpDir(opts: std.fs.Dir.OpenOptions) TmpDir {
629	const cwd = std.fs.cwd();	629	const cwd = std.fs.cwd();
630	var cache_dir = cwd.makeOpenPath(".zig-cache", .{}) catch	630	var cache_dir = cwd.makeOpenPath(".zig-cache", .{}) catch
631	@panic("unable to make tmp dir for testing: unable to make and open .zig-cache dir");	631	@panic("unable to make tmp dir for testing: unable to make and open .zig-cache dir");
632	defer cache_dir.close();	632	defer cache_dir.close(io);
633	const parent_dir = cache_dir.makeOpenPath("tmp", .{}) catch	633	const parent_dir = cache_dir.makeOpenPath("tmp", .{}) catch
634	@panic("unable to make tmp dir for testing: unable to make and open .zig-cache/tmp dir");	634	@panic("unable to make tmp dir for testing: unable to make and open .zig-cache/tmp dir");
635	const dir = parent_dir.makeOpenPath(&sub_path, opts) catch	635	const dir = parent_dir.makeOpenPath(&sub_path, opts) catch

...	@@ -1,7 +1,10 @@	...	@@ -1,7 +1,10 @@
1	const WindowsSdk = @This();	1	const WindowsSdk = @This();
2	const builtin = @import("builtin");	2	const builtin = @import("builtin");
		3
3	const std = @import("std");	4	const std = @import("std");
		5	const Io = std.Io;
4	const Writer = std.Io.Writer;	6	const Writer = std.Io.Writer;
		7	const Allocator = std.mem.Allocator;
5		8
6	windows10sdk: ?Installation,	9	windows10sdk: ?Installation,
7	windows81sdk: ?Installation,	10	windows81sdk: ?Installation,
...	@@ -20,7 +23,7 @@ const product_version_max_length = version_major_minor_max_length + ".65535".len	...	@@ -20,7 +23,7 @@ const product_version_max_length = version_major_minor_max_length + ".65535".len
20	/// Find path and version of Windows 10 SDK and Windows 8.1 SDK, and find path to MSVC's `lib/` directory.	23	/// Find path and version of Windows 10 SDK and Windows 8.1 SDK, and find path to MSVC's `lib/` directory.
21	/// Caller owns the result's fields.	24	/// Caller owns the result's fields.
22	/// After finishing work, call `free(allocator)`.	25	/// After finishing work, call `free(allocator)`.
23	pub fn find(allocator: std.mem.Allocator, arch: std.Target.Cpu.Arch) error{ OutOfMemory, NotFound, PathTooLong }!WindowsSdk {	26	pub fn find(allocator: Allocator, arch: std.Target.Cpu.Arch) error{ OutOfMemory, NotFound, PathTooLong }!WindowsSdk {
24	if (builtin.os.tag != .windows) return error.NotFound;	27	if (builtin.os.tag != .windows) return error.NotFound;
25		28
26	//note(dimenus): If this key doesn't exist, neither the Win 8 SDK nor the Win 10 SDK is installed	29	//note(dimenus): If this key doesn't exist, neither the Win 8 SDK nor the Win 10 SDK is installed
...	@@ -58,7 +61,7 @@ pub fn find(allocator: std.mem.Allocator, arch: std.Target.Cpu.Arch) error{ OutO	...	@@ -58,7 +61,7 @@ pub fn find(allocator: std.mem.Allocator, arch: std.Target.Cpu.Arch) error{ OutO
58	};	61	};
59	}	62	}
60		63
61	pub fn free(sdk: WindowsSdk, allocator: std.mem.Allocator) void {	64	pub fn free(sdk: WindowsSdk, allocator: Allocator) void {
62	if (sdk.windows10sdk) \|*w10sdk\| {	65	if (sdk.windows10sdk) \|*w10sdk\| {
63	w10sdk.free(allocator);	66	w10sdk.free(allocator);
64	}	67	}
...	@@ -75,7 +78,7 @@ pub fn free(sdk: WindowsSdk, allocator: std.mem.Allocator) void {	...	@@ -75,7 +78,7 @@ pub fn free(sdk: WindowsSdk, allocator: std.mem.Allocator) void {
75	/// Caller owns result.	78	/// Caller owns result.
76	fn iterateAndFilterByVersion(	79	fn iterateAndFilterByVersion(
77	iterator: *std.fs.Dir.Iterator,	80	iterator: *std.fs.Dir.Iterator,
78	allocator: std.mem.Allocator,	81	allocator: Allocator,
79	prefix: []const u8,	82	prefix: []const u8,
80	) error{OutOfMemory}![][]const u8 {	83	) error{OutOfMemory}![][]const u8 {
81	const Version = struct {	84	const Version = struct {
...	@@ -174,7 +177,7 @@ const RegistryWtf8 = struct {	...	@@ -174,7 +177,7 @@ const RegistryWtf8 = struct {
174		177
175	/// Get string from registry.	178	/// Get string from registry.
176	/// Caller owns result.	179	/// Caller owns result.
177	pub fn getString(reg: RegistryWtf8, allocator: std.mem.Allocator, subkey: []const u8, value_name: []const u8) error{ OutOfMemory, ValueNameNotFound, NotAString, StringNotFound }![]u8 {	180	pub fn getString(reg: RegistryWtf8, allocator: Allocator, subkey: []const u8, value_name: []const u8) error{ OutOfMemory, ValueNameNotFound, NotAString, StringNotFound }![]u8 {
178	const subkey_wtf16le: [:0]const u16 = subkey_wtf16le: {	181	const subkey_wtf16le: [:0]const u16 = subkey_wtf16le: {
179	var subkey_wtf16le_buf: [RegistryWtf16Le.key_name_max_len]u16 = undefined;	182	var subkey_wtf16le_buf: [RegistryWtf16Le.key_name_max_len]u16 = undefined;
180	const subkey_wtf16le_len: usize = std.unicode.wtf8ToWtf16Le(subkey_wtf16le_buf[0..], subkey) catch unreachable;	183	const subkey_wtf16le_len: usize = std.unicode.wtf8ToWtf16Le(subkey_wtf16le_buf[0..], subkey) catch unreachable;
...	@@ -282,7 +285,7 @@ const RegistryWtf16Le = struct {	...	@@ -282,7 +285,7 @@ const RegistryWtf16Le = struct {
282	}	285	}
283		286
284	/// Get string ([:0]const u16) from registry.	287	/// Get string ([:0]const u16) from registry.
285	fn getString(reg: RegistryWtf16Le, allocator: std.mem.Allocator, subkey_wtf16le: [:0]const u16, value_name_wtf16le: [:0]const u16) error{ OutOfMemory, ValueNameNotFound, NotAString, StringNotFound }![]const u16 {	288	fn getString(reg: RegistryWtf16Le, allocator: Allocator, subkey_wtf16le: [:0]const u16, value_name_wtf16le: [:0]const u16) error{ OutOfMemory, ValueNameNotFound, NotAString, StringNotFound }![]const u16 {
286	var actual_type: windows.ULONG = undefined;	289	var actual_type: windows.ULONG = undefined;
287		290
288	// Calculating length to allocate	291	// Calculating length to allocate
...	@@ -416,7 +419,7 @@ pub const Installation = struct {	...	@@ -416,7 +419,7 @@ pub const Installation = struct {
416	/// Caller owns the result's fields.	419	/// Caller owns the result's fields.
417	/// After finishing work, call `free(allocator)`.	420	/// After finishing work, call `free(allocator)`.
418	fn find(	421	fn find(
419	allocator: std.mem.Allocator,	422	allocator: Allocator,
420	roots_key: RegistryWtf8,	423	roots_key: RegistryWtf8,
421	roots_subkey: []const u8,	424	roots_subkey: []const u8,
422	prefix: []const u8,	425	prefix: []const u8,
...	@@ -437,7 +440,8 @@ pub const Installation = struct {	...	@@ -437,7 +440,8 @@ pub const Installation = struct {
437	}	440	}
438		441
439	fn findFromRoot(	442	fn findFromRoot(
440	allocator: std.mem.Allocator,	443	allocator: Allocator,
		444	io: Io,
441	roots_key: RegistryWtf8,	445	roots_key: RegistryWtf8,
442	roots_subkey: []const u8,	446	roots_subkey: []const u8,
443	prefix: []const u8,	447	prefix: []const u8,
...	@@ -478,7 +482,7 @@ pub const Installation = struct {	...	@@ -478,7 +482,7 @@ pub const Installation = struct {
478	error.NameTooLong => return error.PathTooLong,	482	error.NameTooLong => return error.PathTooLong,
479	else => return error.InstallationNotFound,	483	else => return error.InstallationNotFound,
480	};	484	};
481	defer sdk_lib_dir.close();	485	defer sdk_lib_dir.close(io);
482		486
483	var iterator = sdk_lib_dir.iterate();	487	var iterator = sdk_lib_dir.iterate();
484	const versions = try iterateAndFilterByVersion(&iterator, allocator, prefix);	488	const versions = try iterateAndFilterByVersion(&iterator, allocator, prefix);
...	@@ -495,7 +499,7 @@ pub const Installation = struct {	...	@@ -495,7 +499,7 @@ pub const Installation = struct {
495	}	499	}
496		500
497	fn findFromInstallationFolder(	501	fn findFromInstallationFolder(
498	allocator: std.mem.Allocator,	502	allocator: Allocator,
499	version_key_name: []const u8,	503	version_key_name: []const u8,
500	) error{ OutOfMemory, InstallationNotFound, PathTooLong, VersionTooLong }!Installation {	504	) error{ OutOfMemory, InstallationNotFound, PathTooLong, VersionTooLong }!Installation {
501	var key_name_buf: [RegistryWtf16Le.key_name_max_len]u8 = undefined;	505	var key_name_buf: [RegistryWtf16Le.key_name_max_len]u8 = undefined;
...	@@ -597,14 +601,14 @@ pub const Installation = struct {	...	@@ -597,14 +601,14 @@ pub const Installation = struct {
597	return (reg_value == 1);	601	return (reg_value == 1);
598	}	602	}
599		603
600	fn free(install: Installation, allocator: std.mem.Allocator) void {	604	fn free(install: Installation, allocator: Allocator) void {
601	allocator.free(install.path);	605	allocator.free(install.path);
602	allocator.free(install.version);	606	allocator.free(install.version);
603	}	607	}
604	};	608	};
605		609
606	const MsvcLibDir = struct {	610	const MsvcLibDir = struct {
607	fn findInstancesDirViaSetup(allocator: std.mem.Allocator) error{ OutOfMemory, PathNotFound }!std.fs.Dir {	611	fn findInstancesDirViaSetup(allocator: Allocator) error{ OutOfMemory, PathNotFound }!std.fs.Dir {
608	const vs_setup_key_path = "SOFTWARE\\Microsoft\\VisualStudio\\Setup";	612	const vs_setup_key_path = "SOFTWARE\\Microsoft\\VisualStudio\\Setup";
609	const vs_setup_key = RegistryWtf8.openKey(windows.HKEY_LOCAL_MACHINE, vs_setup_key_path, .{}) catch \|err\| switch (err) {	613	const vs_setup_key = RegistryWtf8.openKey(windows.HKEY_LOCAL_MACHINE, vs_setup_key_path, .{}) catch \|err\| switch (err) {
610	error.KeyNotFound => return error.PathNotFound,	614	error.KeyNotFound => return error.PathNotFound,
...	@@ -629,7 +633,7 @@ const MsvcLibDir = struct {	...	@@ -629,7 +633,7 @@ const MsvcLibDir = struct {
629	return std.fs.openDirAbsolute(instances_path, .{ .iterate = true }) catch return error.PathNotFound;	633	return std.fs.openDirAbsolute(instances_path, .{ .iterate = true }) catch return error.PathNotFound;
630	}	634	}
631		635
632	fn findInstancesDirViaCLSID(allocator: std.mem.Allocator) error{ OutOfMemory, PathNotFound }!std.fs.Dir {	636	fn findInstancesDirViaCLSID(allocator: Allocator) error{ OutOfMemory, PathNotFound }!std.fs.Dir {
633	const setup_configuration_clsid = "{177f0c4a-1cd3-4de7-a32c-71dbbb9fa36d}";	637	const setup_configuration_clsid = "{177f0c4a-1cd3-4de7-a32c-71dbbb9fa36d}";
634	const setup_config_key = RegistryWtf8.openKey(windows.HKEY_CLASSES_ROOT, "CLSID\\" ++ setup_configuration_clsid, .{}) catch \|err\| switch (err) {	638	const setup_config_key = RegistryWtf8.openKey(windows.HKEY_CLASSES_ROOT, "CLSID\\" ++ setup_configuration_clsid, .{}) catch \|err\| switch (err) {
635	error.KeyNotFound => return error.PathNotFound,	639	error.KeyNotFound => return error.PathNotFound,
...	@@ -665,7 +669,7 @@ const MsvcLibDir = struct {	...	@@ -665,7 +669,7 @@ const MsvcLibDir = struct {
665	return std.fs.openDirAbsolute(instances_path, .{ .iterate = true }) catch return error.PathNotFound;	669	return std.fs.openDirAbsolute(instances_path, .{ .iterate = true }) catch return error.PathNotFound;
666	}	670	}
667		671
668	fn findInstancesDir(allocator: std.mem.Allocator) error{ OutOfMemory, PathNotFound }!std.fs.Dir {	672	fn findInstancesDir(allocator: Allocator) error{ OutOfMemory, PathNotFound }!std.fs.Dir {
669	// First, try getting the packages cache path from the registry.	673	// First, try getting the packages cache path from the registry.
670	// This only seems to exist when the path is different from the default.	674	// This only seems to exist when the path is different from the default.
671	method1: {	675	method1: {
...	@@ -748,13 +752,13 @@ const MsvcLibDir = struct {	...	@@ -748,13 +752,13 @@ const MsvcLibDir = struct {
748	///	752	///
749	/// The logic in this function is intended to match what ISetupConfiguration does	753	/// The logic in this function is intended to match what ISetupConfiguration does
750	/// under-the-hood, as verified using Procmon.	754	/// under-the-hood, as verified using Procmon.
751	fn findViaCOM(allocator: std.mem.Allocator, arch: std.Target.Cpu.Arch) error{ OutOfMemory, PathNotFound }![]const u8 {	755	fn findViaCOM(allocator: Allocator, io: Io, arch: std.Target.Cpu.Arch) error{ OutOfMemory, PathNotFound }![]const u8 {
752	// Typically `%PROGRAMDATA%\Microsoft\VisualStudio\Packages\_Instances`	756	// Typically `%PROGRAMDATA%\Microsoft\VisualStudio\Packages\_Instances`
753	// This will contain directories with names of instance IDs like 80a758ca,	757	// This will contain directories with names of instance IDs like 80a758ca,
754	// which will contain `state.json` files that have the version and	758	// which will contain `state.json` files that have the version and
755	// installation directory.	759	// installation directory.
756	var instances_dir = try findInstancesDir(allocator);	760	var instances_dir = try findInstancesDir(allocator);
757	defer instances_dir.close();	761	defer instances_dir.close(io);
758		762
759	var state_subpath_buf: [std.fs.max_name_bytes + 32]u8 = undefined;	763	var state_subpath_buf: [std.fs.max_name_bytes + 32]u8 = undefined;
760	var latest_version_lib_dir: std.ArrayList(u8) = .empty;	764	var latest_version_lib_dir: std.ArrayList(u8) = .empty;
...	@@ -791,7 +795,7 @@ const MsvcLibDir = struct {	...	@@ -791,7 +795,7 @@ const MsvcLibDir = struct {
791	const installation_path = parsed.value.object.get("installationPath") orelse continue;	795	const installation_path = parsed.value.object.get("installationPath") orelse continue;
792	if (installation_path != .string) continue;	796	if (installation_path != .string) continue;
793		797
794	const lib_dir_path = libDirFromInstallationPath(allocator, installation_path.string, arch) catch \|err\| switch (err) {	798	const lib_dir_path = libDirFromInstallationPath(allocator, io, installation_path.string, arch) catch \|err\| switch (err) {
795	error.OutOfMemory => \|e\| return e,	799	error.OutOfMemory => \|e\| return e,
796	error.PathNotFound => continue,	800	error.PathNotFound => continue,
797	};	801	};
...	@@ -806,7 +810,12 @@ const MsvcLibDir = struct {	...	@@ -806,7 +810,12 @@ const MsvcLibDir = struct {
806	return latest_version_lib_dir.toOwnedSlice(allocator);	810	return latest_version_lib_dir.toOwnedSlice(allocator);
807	}	811	}
808		812
809	fn libDirFromInstallationPath(allocator: std.mem.Allocator, installation_path: []const u8, arch: std.Target.Cpu.Arch) error{ OutOfMemory, PathNotFound }![]const u8 {	813	fn libDirFromInstallationPath(
		814	allocator: Allocator,
		815	io: Io,
		816	installation_path: []const u8,
		817	arch: std.Target.Cpu.Arch,
		818	) error{ OutOfMemory, PathNotFound }![]const u8 {
810	var lib_dir_buf = try std.array_list.Managed(u8).initCapacity(allocator, installation_path.len + 64);	819	var lib_dir_buf = try std.array_list.Managed(u8).initCapacity(allocator, installation_path.len + 64);
811	errdefer lib_dir_buf.deinit();	820	errdefer lib_dir_buf.deinit();
812		821
...	@@ -837,7 +846,7 @@ const MsvcLibDir = struct {	...	@@ -837,7 +846,7 @@ const MsvcLibDir = struct {
837	else => unreachable,	846	else => unreachable,
838	});	847	});
839		848
840	if (!verifyLibDir(lib_dir_buf.items)) {	849	if (!verifyLibDir(io, lib_dir_buf.items)) {
841	return error.PathNotFound;	850	return error.PathNotFound;
842	}	851	}
843		852
...	@@ -845,7 +854,7 @@ const MsvcLibDir = struct {	...	@@ -845,7 +854,7 @@ const MsvcLibDir = struct {
845	}	854	}
846		855
847	// https://learn.microsoft.com/en-us/visualstudio/install/tools-for-managing-visual-studio-instances?view=vs-2022#editing-the-registry-for-a-visual-studio-instance	856	// https://learn.microsoft.com/en-us/visualstudio/install/tools-for-managing-visual-studio-instances?view=vs-2022#editing-the-registry-for-a-visual-studio-instance
848	fn findViaRegistry(allocator: std.mem.Allocator, arch: std.Target.Cpu.Arch) error{ OutOfMemory, PathNotFound }![]const u8 {	857	fn findViaRegistry(allocator: Allocator, io: Io, arch: std.Target.Cpu.Arch) error{ OutOfMemory, PathNotFound }![]const u8 {
849		858
850	// %localappdata%\Microsoft\VisualStudio\	859	// %localappdata%\Microsoft\VisualStudio\
851	// %appdata%\Local\Microsoft\VisualStudio\	860	// %appdata%\Local\Microsoft\VisualStudio\
...	@@ -859,7 +868,7 @@ const MsvcLibDir = struct {	...	@@ -859,7 +868,7 @@ const MsvcLibDir = struct {
859	var visualstudio_folder = std.fs.openDirAbsolute(visualstudio_folder_path, .{	868	var visualstudio_folder = std.fs.openDirAbsolute(visualstudio_folder_path, .{
860	.iterate = true,	869	.iterate = true,
861	}) catch return error.PathNotFound;	870	}) catch return error.PathNotFound;
862	defer visualstudio_folder.close();	871	defer visualstudio_folder.close(io);
863		872
864	var iterator = visualstudio_folder.iterate();	873	var iterator = visualstudio_folder.iterate();
865	break :vs_versions try iterateAndFilterByVersion(&iterator, allocator, "");	874	break :vs_versions try iterateAndFilterByVersion(&iterator, allocator, "");
...	@@ -926,14 +935,14 @@ const MsvcLibDir = struct {	...	@@ -926,14 +935,14 @@ const MsvcLibDir = struct {
926	};	935	};
927	errdefer allocator.free(msvc_dir);	936	errdefer allocator.free(msvc_dir);
928		937
929	if (!verifyLibDir(msvc_dir)) {	938	if (!verifyLibDir(io, msvc_dir)) {
930	return error.PathNotFound;	939	return error.PathNotFound;
931	}	940	}
932		941
933	return msvc_dir;	942	return msvc_dir;
934	}	943	}
935		944
936	fn findViaVs7Key(allocator: std.mem.Allocator, arch: std.Target.Cpu.Arch) error{ OutOfMemory, PathNotFound }![]const u8 {	945	fn findViaVs7Key(allocator: Allocator, io: Io, arch: std.Target.Cpu.Arch) error{ OutOfMemory, PathNotFound }![]const u8 {
937	var base_path: std.array_list.Managed(u8) = base_path: {	946	var base_path: std.array_list.Managed(u8) = base_path: {
938	try_env: {	947	try_env: {
939	var env_map = std.process.getEnvMap(allocator) catch \|err\| switch (err) {	948	var env_map = std.process.getEnvMap(allocator) catch \|err\| switch (err) {
...	@@ -989,7 +998,7 @@ const MsvcLibDir = struct {	...	@@ -989,7 +998,7 @@ const MsvcLibDir = struct {
989	else => unreachable,	998	else => unreachable,
990	});	999	});
991		1000
992	if (!verifyLibDir(base_path.items)) {	1001	if (!verifyLibDir(io, base_path.items)) {
993	return error.PathNotFound;	1002	return error.PathNotFound;
994	}	1003	}
995		1004
...	@@ -997,11 +1006,11 @@ const MsvcLibDir = struct {	...	@@ -997,11 +1006,11 @@ const MsvcLibDir = struct {
997	return full_path;	1006	return full_path;
998	}	1007	}
999		1008
1000	fn verifyLibDir(lib_dir_path: []const u8) bool {	1009	fn verifyLibDir(io: Io, lib_dir_path: []const u8) bool {
1001	std.debug.assert(std.fs.path.isAbsolute(lib_dir_path)); // should be already handled in `findVia*`	1010	std.debug.assert(std.fs.path.isAbsolute(lib_dir_path)); // should be already handled in `findVia*`
1002		1011
1003	var dir = std.fs.openDirAbsolute(lib_dir_path, .{}) catch return false;	1012	var dir = std.fs.openDirAbsolute(lib_dir_path, .{}) catch return false;
1004	defer dir.close();	1013	defer dir.close(io);
1005		1014
1006	const stat = dir.statFile("vcruntime.lib") catch return false;	1015	const stat = dir.statFile("vcruntime.lib") catch return false;
1007	if (stat.kind != .file)	1016	if (stat.kind != .file)
...	@@ -1012,12 +1021,12 @@ const MsvcLibDir = struct {	...	@@ -1012,12 +1021,12 @@ const MsvcLibDir = struct {
1012		1021
1013	/// Find path to MSVC's `lib/` directory.	1022	/// Find path to MSVC's `lib/` directory.
1014	/// Caller owns the result.	1023	/// Caller owns the result.
1015	pub fn find(allocator: std.mem.Allocator, arch: std.Target.Cpu.Arch) error{ OutOfMemory, MsvcLibDirNotFound }![]const u8 {	1024	pub fn find(allocator: Allocator, io: Io, arch: std.Target.Cpu.Arch) error{ OutOfMemory, MsvcLibDirNotFound }![]const u8 {
1016	const full_path = MsvcLibDir.findViaCOM(allocator, arch) catch \|err1\| switch (err1) {	1025	const full_path = MsvcLibDir.findViaCOM(allocator, io, arch) catch \|err1\| switch (err1) {
1017	error.OutOfMemory => return error.OutOfMemory,	1026	error.OutOfMemory => return error.OutOfMemory,
1018	error.PathNotFound => MsvcLibDir.findViaRegistry(allocator, arch) catch \|err2\| switch (err2) {	1027	error.PathNotFound => MsvcLibDir.findViaRegistry(allocator, io, arch) catch \|err2\| switch (err2) {
1019	error.OutOfMemory => return error.OutOfMemory,	1028	error.OutOfMemory => return error.OutOfMemory,
1020	error.PathNotFound => MsvcLibDir.findViaVs7Key(allocator, arch) catch \|err3\| switch (err3) {	1029	error.PathNotFound => MsvcLibDir.findViaVs7Key(allocator, io, arch) catch \|err3\| switch (err3) {
1021	error.OutOfMemory => return error.OutOfMemory,	1030	error.OutOfMemory => return error.OutOfMemory,
1022	error.PathNotFound => return error.MsvcLibDirNotFound,	1031	error.PathNotFound => return error.MsvcLibDirNotFound,
1023	},	1032	},

...	@@ -96,7 +96,7 @@ pub fn updateFile(	...	@@ -96,7 +96,7 @@ pub fn updateFile(
96	const dir, const sub_path = file.path.openInfo(comp.dirs);	96	const dir, const sub_path = file.path.openInfo(comp.dirs);
97	break :f try dir.openFile(sub_path, .{});	97	break :f try dir.openFile(sub_path, .{});
98	};	98	};
99	defer source_file.close();	99	defer source_file.close(io);
100		100
101	const stat = try source_file.stat();	101	const stat = try source_file.stat();
102		102
...	@@ -215,7 +215,7 @@ pub fn updateFile(	...	@@ -215,7 +215,7 @@ pub fn updateFile(
215	else => \|e\| return e, // Retryable errors are handled at callsite.	215	else => \|e\| return e, // Retryable errors are handled at callsite.
216	};	216	};
217	};	217	};
218	defer cache_file.close();	218	defer cache_file.close(io);
219		219
220	// Under `--time-report`, ignore cache hits; do the work anyway for those juicy numbers.	220	// Under `--time-report`, ignore cache hits; do the work anyway for those juicy numbers.
221	const ignore_hit = comp.time_report != null;	221	const ignore_hit = comp.time_report != null;
...	@@ -2468,7 +2468,7 @@ fn updateEmbedFileInner(	...	@@ -2468,7 +2468,7 @@ fn updateEmbedFileInner(
2468	const dir, const sub_path = ef.path.openInfo(zcu.comp.dirs);	2468	const dir, const sub_path = ef.path.openInfo(zcu.comp.dirs);
2469	break :f try dir.openFile(sub_path, .{});	2469	break :f try dir.openFile(sub_path, .{});
2470	};	2470	};
2471	defer file.close();	2471	defer file.close(io);
2472		2472
2473	const stat: Cache.File.Stat = .fromFs(try file.stat());	2473	const stat: Cache.File.Stat = .fromFs(try file.stat());
2474		2474

...	@@ -799,6 +799,7 @@ pub const Object = struct {	...	@@ -799,6 +799,7 @@ pub const Object = struct {
799	pub fn emit(o: *Object, pt: Zcu.PerThread, options: EmitOptions) error{ LinkFailure, OutOfMemory }!void {	799	pub fn emit(o: *Object, pt: Zcu.PerThread, options: EmitOptions) error{ LinkFailure, OutOfMemory }!void {
800	const zcu = pt.zcu;	800	const zcu = pt.zcu;
801	const comp = zcu.comp;	801	const comp = zcu.comp;
		802	const io = comp.io;
802	const diags = &comp.link_diags;	803	const diags = &comp.link_diags;
803		804
804	{	805	{
...	@@ -979,7 +980,7 @@ pub const Object = struct {	...	@@ -979,7 +980,7 @@ pub const Object = struct {
979	if (options.pre_bc_path) \|path\| {	980	if (options.pre_bc_path) \|path\| {
980	var file = std.fs.cwd().createFile(path, .{}) catch \|err\|	981	var file = std.fs.cwd().createFile(path, .{}) catch \|err\|
981	return diags.fail("failed to create '{s}': {s}", .{ path, @errorName(err) });	982	return diags.fail("failed to create '{s}': {s}", .{ path, @errorName(err) });
982	defer file.close();	983	defer file.close(io);
983		984
984	const ptr: [*]const u8 = @ptrCast(bitcode.ptr);	985	const ptr: [*]const u8 = @ptrCast(bitcode.ptr);
985	file.writeAll(ptr[0..(bitcode.len * 4)]) catch \|err\|	986	file.writeAll(ptr[0..(bitcode.len * 4)]) catch \|err\|
...	@@ -992,7 +993,7 @@ pub const Object = struct {	...	@@ -992,7 +993,7 @@ pub const Object = struct {
992	if (options.post_bc_path) \|path\| {	993	if (options.post_bc_path) \|path\| {
993	var file = std.fs.cwd().createFile(path, .{}) catch \|err\|	994	var file = std.fs.cwd().createFile(path, .{}) catch \|err\|
994	return diags.fail("failed to create '{s}': {s}", .{ path, @errorName(err) });	995	return diags.fail("failed to create '{s}': {s}", .{ path, @errorName(err) });
995	defer file.close();	996	defer file.close(io);
996		997
997	const ptr: [*]const u8 = @ptrCast(bitcode.ptr);	998	const ptr: [*]const u8 = @ptrCast(bitcode.ptr);
998	file.writeAll(ptr[0..(bitcode.len * 4)]) catch \|err\|	999	file.writeAll(ptr[0..(bitcode.len * 4)]) catch \|err\|

...	@@ -262,7 +262,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {	...	@@ -262,7 +262,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
262	cache.addPrefix(.{ .path = null, .handle = std.fs.cwd() });	262	cache.addPrefix(.{ .path = null, .handle = std.fs.cwd() });
263	cache.addPrefix(comp.dirs.zig_lib);	263	cache.addPrefix(comp.dirs.zig_lib);
264	cache.addPrefix(comp.dirs.global_cache);	264	cache.addPrefix(comp.dirs.global_cache);
265	defer cache.manifest_dir.close();	265	defer cache.manifest_dir.close(io);
266		266
267	cache.hash.addBytes(build_options.version);	267	cache.hash.addBytes(build_options.version);
268	cache.hash.addOptionalBytes(comp.dirs.zig_lib.path);	268	cache.hash.addOptionalBytes(comp.dirs.zig_lib.path);
...	@@ -297,7 +297,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {	...	@@ -297,7 +297,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
297	const digest = man.final();	297	const digest = man.final();
298	const o_sub_path = try std.fs.path.join(arena, &[_][]const u8{ "o", &digest });	298	const o_sub_path = try std.fs.path.join(arena, &[_][]const u8{ "o", &digest });
299	var o_dir = try comp.dirs.global_cache.handle.makeOpenPath(o_sub_path, .{});	299	var o_dir = try comp.dirs.global_cache.handle.makeOpenPath(o_sub_path, .{});
300	defer o_dir.close();	300	defer o_dir.close(io);
301		301
302	const aro = @import("aro");	302	const aro = @import("aro");
303	var diagnostics: aro.Diagnostics = .{	303	var diagnostics: aro.Diagnostics = .{
...	@@ -377,7 +377,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {	...	@@ -377,7 +377,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
377		377
378	{	378	{
379	const lib_final_file = try o_dir.createFile(final_lib_basename, .{ .truncate = true });	379	const lib_final_file = try o_dir.createFile(final_lib_basename, .{ .truncate = true });
380	defer lib_final_file.close();	380	defer lib_final_file.close(io);
381	var buffer: [1024]u8 = undefined;	381	var buffer: [1024]u8 = undefined;
382	var file_writer = lib_final_file.writer(&buffer);	382	var file_writer = lib_final_file.writer(&buffer);
383	try implib.writeCoffArchive(gpa, &file_writer.interface, members);	383	try implib.writeCoffArchive(gpa, &file_writer.interface, members);

...	@@ -124,6 +124,7 @@ pub fn createEmpty(	...	@@ -124,6 +124,7 @@ pub fn createEmpty(
124	emit: Path,	124	emit: Path,
125	options: link.File.OpenOptions,	125	options: link.File.OpenOptions,
126	) !*C {	126	) !*C {
		127	const io = comp.io;
127	const target = &comp.root_mod.resolved_target.result;	128	const target = &comp.root_mod.resolved_target.result;
128	assert(target.ofmt == .c);	129	assert(target.ofmt == .c);
129	const optimize_mode = comp.root_mod.optimize_mode;	130	const optimize_mode = comp.root_mod.optimize_mode;
...	@@ -139,7 +140,7 @@ pub fn createEmpty(	...	@@ -139,7 +140,7 @@ pub fn createEmpty(
139	// Truncation is done on `flush`.	140	// Truncation is done on `flush`.
140	.truncate = false,	141	.truncate = false,
141	});	142	});
142	errdefer file.close();	143	errdefer file.close(io);
143		144
144	const c_file = try arena.create(C);	145	const c_file = try arena.create(C);
145		146
...	@@ -763,6 +764,7 @@ pub fn flushEmitH(zcu: *Zcu) !void {	...	@@ -763,6 +764,7 @@ pub fn flushEmitH(zcu: *Zcu) !void {
763	if (true) return; // emit-h is regressed	764	if (true) return; // emit-h is regressed
764		765
765	const emit_h = zcu.emit_h orelse return;	766	const emit_h = zcu.emit_h orelse return;
		767	const io = zcu.comp.io;
766		768
767	// We collect a list of buffers to write, and write them all at once with pwritev 😎	769	// We collect a list of buffers to write, and write them all at once with pwritev 😎
768	const num_buffers = emit_h.decl_table.count() + 1;	770	const num_buffers = emit_h.decl_table.count() + 1;
...	@@ -795,7 +797,7 @@ pub fn flushEmitH(zcu: *Zcu) !void {	...	@@ -795,7 +797,7 @@ pub fn flushEmitH(zcu: *Zcu) !void {
795	// make it easier on the file system by doing 1 reallocation instead of two.	797	// make it easier on the file system by doing 1 reallocation instead of two.
796	.truncate = false,	798	.truncate = false,
797	});	799	});
798	defer file.close();	800	defer file.close(io);
799		801
800	try file.setEndPos(file_size);	802	try file.setEndPos(file_size);
801	try file.pwritevAll(all_buffers.items, 0);	803	try file.pwritevAll(all_buffers.items, 0);

update all occurrences of close() to close(io)