Commit 3204fb756980c19b7a95534acdd7a1bba837fbc3 | zig

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

...	@@ -1646,7 +1646,7 @@ fn addSourceFromPathExtra(comp: *Compilation, path: []const u8, kind: Source.Kin	...	@@ -1646,7 +1646,7 @@ fn addSourceFromPathExtra(comp: *Compilation, path: []const u8, kind: Source.Kin
1646	return comp.addSourceFromFile(file, path, kind);	1646	return comp.addSourceFromFile(file, path, kind);
1647	}	1647	}
1648		1648
1649	pub fn addSourceFromFile(comp: *Compilation, file: std.fs.File, path: []const u8, kind: Source.Kind) !Source {	1649	pub fn addSourceFromFile(comp: *Compilation, file: Io.File, path: []const u8, kind: Source.Kind) !Source {
1650	const contents = try comp.getFileContents(file, .unlimited);	1650	const contents = try comp.getFileContents(file, .unlimited);
1651	errdefer comp.gpa.free(contents);	1651	errdefer comp.gpa.free(contents);
1652	return comp.addSourceFromOwnedBuffer(path, contents, kind);	1652	return comp.addSourceFromOwnedBuffer(path, contents, kind);
...	@@ -1980,7 +1980,7 @@ fn getPathContents(comp: *Compilation, path: []const u8, limit: Io.Limit) ![]u8	...	@@ -1980,7 +1980,7 @@ fn getPathContents(comp: *Compilation, path: []const u8, limit: Io.Limit) ![]u8
1980	return comp.getFileContents(file, limit);	1980	return comp.getFileContents(file, limit);
1981	}	1981	}
1982		1982
1983	fn getFileContents(comp: *Compilation, file: std.fs.File, limit: Io.Limit) ![]u8 {	1983	fn getFileContents(comp: *Compilation, file: Io.File, limit: Io.Limit) ![]u8 {
1984	var file_buf: [4096]u8 = undefined;	1984	var file_buf: [4096]u8 = undefined;
1985	var file_reader = file.reader(comp.io, &file_buf);	1985	var file_reader = file.reader(comp.io, &file_buf);
1986		1986

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

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

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const Io = std.Io;
2	const mem = std.mem;	3	const mem = std.mem;
3	const Allocator = mem.Allocator;	4	const Allocator = mem.Allocator;
4	const assert = std.debug.assert;	5	const assert = std.debug.assert;
...	@@ -1068,7 +1069,7 @@ fn verboseLog(pp: *Preprocessor, raw: RawToken, comptime fmt: []const u8, args:	...	@@ -1068,7 +1069,7 @@ fn verboseLog(pp: *Preprocessor, raw: RawToken, comptime fmt: []const u8, args:
1068	const line_col = source.lineCol(.{ .id = raw.source, .line = raw.line, .byte_offset = raw.start });	1069	const line_col = source.lineCol(.{ .id = raw.source, .line = raw.line, .byte_offset = raw.start });
1069		1070
1070	var stderr_buf: [4096]u8 = undefined;	1071	var stderr_buf: [4096]u8 = undefined;
1071	var stderr = std.fs.File.stderr().writer(&stderr_buf);	1072	var stderr = Io.File.stderr().writer(&stderr_buf);
1072	const w = &stderr.interface;	1073	const w = &stderr.interface;
1073		1074
1074	w.print("{s}:{d}:{d}: ", .{ source.path, line_col.line_no, line_col.col }) catch return;	1075	w.print("{s}:{d}:{d}: ", .{ source.path, line_col.line_no, line_col.col }) catch return;

lib/compiler/aro/backend/Assembly.zig+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const Io = std.Io;
2	const Allocator = std.mem.Allocator;	3	const Allocator = std.mem.Allocator;
3		4
4	data: []const u8,	5	data: []const u8,
...	@@ -11,7 +12,7 @@ pub fn deinit(self: *const Assembly, gpa: Allocator) void {	...	@@ -11,7 +12,7 @@ pub fn deinit(self: *const Assembly, gpa: Allocator) void {
11	gpa.free(self.text);	12	gpa.free(self.text);
12	}	13	}
13		14
14	pub fn writeToFile(self: Assembly, file: std.fs.File) !void {	15	pub fn writeToFile(self: Assembly, file: Io.File) !void {
15	var file_writer = file.writer(&.{});	16	var file_writer = file.writer(&.{});
16		17
17	var buffers = [_][]const u8{ self.data, self.text };	18	var buffers = [_][]const u8{ self.data, self.text };

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

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const Io = std.Io;
2	const Allocator = mem.Allocator;	3	const Allocator = mem.Allocator;
3	const mem = std.mem;	4	const mem = std.mem;
4	const process = std.process;	5	const process = std.process;
...	@@ -50,7 +51,7 @@ pub fn main() u8 {	...	@@ -50,7 +51,7 @@ pub fn main() u8 {
50	defer gpa.free(aro_name);	51	defer gpa.free(aro_name);
51		52
52	var stderr_buf: [1024]u8 = undefined;	53	var stderr_buf: [1024]u8 = undefined;
53	var stderr = std.fs.File.stderr().writer(&stderr_buf);	54	var stderr = Io.File.stderr().writer(&stderr_buf);
54	var diagnostics: Diagnostics = .{	55	var diagnostics: Diagnostics = .{
55	.output = .{ .to_writer = .{	56	.output = .{ .to_writer = .{
56	.color = .detect(stderr.file),	57	.color = .detect(stderr.file),

lib/compiler/build_runner.zig+3-3

...	@@ -7,7 +7,7 @@ const assert = std.debug.assert;	...	@@ -7,7 +7,7 @@ const assert = std.debug.assert;
7	const fmt = std.fmt;	7	const fmt = std.fmt;
8	const mem = std.mem;	8	const mem = std.mem;
9	const process = std.process;	9	const process = std.process;
10	const File = std.fs.File;	10	const File = std.Io.File;
11	const Step = std.Build.Step;	11	const Step = std.Build.Step;
12	const Watch = std.Build.Watch;	12	const Watch = std.Build.Watch;
13	const WebServer = std.Build.WebServer;	13	const WebServer = std.Build.WebServer;
...	@@ -1845,9 +1845,9 @@ fn createModuleDependenciesForStep(step: *Step) Allocator.Error!void {	...	@@ -1845,9 +1845,9 @@ fn createModuleDependenciesForStep(step: *Step) Allocator.Error!void {
1845	}	1845	}
1846		1846
1847	var stdio_buffer_allocation: [256]u8 = undefined;	1847	var stdio_buffer_allocation: [256]u8 = undefined;
1848	var stdout_writer_allocation: std.fs.File.Writer = undefined;	1848	var stdout_writer_allocation: Io.File.Writer = undefined;
1849		1849
1850	fn initStdoutWriter() *Writer {	1850	fn initStdoutWriter() *Writer {
1851	stdout_writer_allocation = std.fs.File.stdout().writerStreaming(&stdio_buffer_allocation);	1851	stdout_writer_allocation = Io.File.stdout().writerStreaming(&stdio_buffer_allocation);
1852	return &stdout_writer_allocation.interface;	1852	return &stdout_writer_allocation.interface;
1853	}	1853	}

lib/compiler/libc.zig+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const Io = std.Io;
2	const mem = std.mem;	3	const mem = std.mem;
3	const LibCInstallation = std.zig.LibCInstallation;	4	const LibCInstallation = std.zig.LibCInstallation;
4		5
...	@@ -39,7 +40,7 @@ pub fn main() !void {	...	@@ -39,7 +40,7 @@ pub fn main() !void {
39	var input_file: ?[]const u8 = null;	40	var input_file: ?[]const u8 = null;
40	var target_arch_os_abi: []const u8 = "native";	41	var target_arch_os_abi: []const u8 = "native";
41	var print_includes: bool = false;	42	var print_includes: bool = false;
42	var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);	43	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
43	const stdout = &stdout_writer.interface;	44	const stdout = &stdout_writer.interface;
44	{	45	{
45	var i: usize = 2;	46	var i: usize = 2;

lib/compiler/objcopy.zig+7-6

 @@ -1,12 +1,13 @@
 const builtin = @import("builtin");
 const std = @import("std");
+const Io = std.Io;
 const mem = std.mem;
 const fs = std.fs;
 const elf = std.elf;
 const Allocator = std.mem.Allocator;
-const File = std.fs.File;
+const File = std.Io.File;
 const assert = std.debug.assert;
 const fatal = std.process.fatal;
 const Server = std.zig.Server;
 @@ -56,7 +57,7 @@ fn cmdObjCopy(gpa: Allocator, arena: Allocator, args: []const []const u8) !void
                 fatal("unexpected positional argument: '{s}'", .{arg});
             }
         } else if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
-            return std.fs.File.stdout().writeAll(usage);
+            return Io.File.stdout().writeAll(usage);
         } else if (mem.eql(u8, arg, "-O") or mem.eql(u8, arg, "--output-target")) {
             i += 1;
             if (i >= args.len) fatal("expected another argument after '{s}'", .{arg});
 @@ -177,7 +178,7 @@ fn cmdObjCopy(gpa: Allocator, arena: Allocator, args: []const []const u8) !void
         }
     };
-    const mode = if (out_fmt != .elf or only_keep_debug) fs.File.default_mode else stat.mode;
+    const mode = if (out_fmt != .elf or only_keep_debug) Io.File.default_mode else stat.mode;
     var output_file = try fs.cwd().createFile(output, .{ .mode = mode });
     defer output_file.close(io);
 @@ -221,8 +222,8 @@ fn cmdObjCopy(gpa: Allocator, arena: Allocator, args: []const []const u8) !void
     try out.end();
     if (listen) {
-        var stdin_reader = fs.File.stdin().reader(io, &stdin_buffer);
+        var stdin_reader = Io.File.stdin().reader(io, &stdin_buffer);
-        var stdout_writer = fs.File.stdout().writer(&stdout_buffer);
+        var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
         var server = try Server.init(.{
             .in = &stdin_reader.interface,
             .out = &stdout_writer.interface,

lib/compiler/reduce.zig+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const Io = std.Io;
2	const mem = std.mem;	3	const mem = std.mem;
3	const Allocator = std.mem.Allocator;	4	const Allocator = std.mem.Allocator;
4	const assert = std.debug.assert;	5	const assert = std.debug.assert;
...	@@ -68,7 +69,7 @@ pub fn main() !void {	...	@@ -68,7 +69,7 @@ pub fn main() !void {
68	const arg = args[i];	69	const arg = args[i];
69	if (mem.startsWith(u8, arg, "-")) {	70	if (mem.startsWith(u8, arg, "-")) {
70	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {	71	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
71	const stdout = std.fs.File.stdout();	72	const stdout = Io.File.stdout();
72	try stdout.writeAll(usage);	73	try stdout.writeAll(usage);
73	return std.process.cleanExit();	74	return std.process.cleanExit();
74	} else if (mem.eql(u8, arg, "--")) {	75	} else if (mem.eql(u8, arg, "--")) {

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

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const Io = std.Io;
2	const code_pages = @import("code_pages.zig");	3	const code_pages = @import("code_pages.zig");
3	const SupportedCodePage = code_pages.SupportedCodePage;	4	const SupportedCodePage = code_pages.SupportedCodePage;
4	const lang = @import("lang.zig");	5	const lang = @import("lang.zig");
...	@@ -169,7 +170,7 @@ pub const Options = struct {	...	@@ -169,7 +170,7 @@ pub const Options = struct {
169	coff_options: cvtres.CoffOptions = .{},	170	coff_options: cvtres.CoffOptions = .{},
170		171
171	pub const IoSource = union(enum) {	172	pub const IoSource = union(enum) {
172	stdio: std.fs.File,	173	stdio: Io.File,
173	filename: []const u8,	174	filename: []const u8,
174	};	175	};
175	pub const AutoIncludes = enum { any, msvc, gnu, none };	176	pub const AutoIncludes = enum { any, msvc, gnu, none };

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

...	@@ -169,9 +169,9 @@ pub const ErrorDetails = struct {	...	@@ -169,9 +169,9 @@ pub const ErrorDetails = struct {
169	filename_string_index: FilenameStringIndex,	169	filename_string_index: FilenameStringIndex,
170		170
171	pub const FilenameStringIndex = std.meta.Int(.unsigned, 32 - @bitSizeOf(FileOpenErrorEnum));	171	pub const FilenameStringIndex = std.meta.Int(.unsigned, 32 - @bitSizeOf(FileOpenErrorEnum));
172	pub const FileOpenErrorEnum = std.meta.FieldEnum(std.fs.File.OpenError \|\| std.fs.File.StatError);	172	pub const FileOpenErrorEnum = std.meta.FieldEnum(Io.File.OpenError \|\| Io.File.StatError);
173		173
174	pub fn enumFromError(err: (std.fs.File.OpenError \|\| std.fs.File.StatError)) FileOpenErrorEnum {	174	pub fn enumFromError(err: (Io.File.OpenError \|\| Io.File.StatError)) FileOpenErrorEnum {
175	return switch (err) {	175	return switch (err) {
176	inline else => \|e\| @field(ErrorDetails.FileOpenError.FileOpenErrorEnum, @errorName(e)),	176	inline else => \|e\| @field(ErrorDetails.FileOpenError.FileOpenErrorEnum, @errorName(e)),
177	};	177	};
...	@@ -1094,8 +1094,8 @@ const CorrespondingLines = struct {	...	@@ -1094,8 +1094,8 @@ const CorrespondingLines = struct {
1094	last_byte: u8 = 0,	1094	last_byte: u8 = 0,
1095	at_eof: bool = false,	1095	at_eof: bool = false,
1096	span: SourceMappings.CorrespondingSpan,	1096	span: SourceMappings.CorrespondingSpan,
1097	file: std.fs.File,	1097	file: Io.File,
1098	file_reader: std.fs.File.Reader,	1098	file_reader: Io.File.Reader,
1099	code_page: SupportedCodePage,	1099	code_page: SupportedCodePage,
1100		1100
1101	pub fn init(	1101	pub fn init(

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

...	@@ -45,7 +45,7 @@ pub fn main() !void {	...	@@ -45,7 +45,7 @@ pub fn main() !void {
45	}	45	}
46		46
47	var stdout_buffer: [1024]u8 = undefined;	47	var stdout_buffer: [1024]u8 = undefined;
48	var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);	48	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
49	const stdout = &stdout_writer.interface;	49	const stdout = &stdout_writer.interface;
50	var error_handler: ErrorHandler = switch (zig_integration) {	50	var error_handler: ErrorHandler = switch (zig_integration) {
51	true => .{	51	true => .{
...	@@ -447,8 +447,8 @@ const IoStream = struct {	...	@@ -447,8 +447,8 @@ const IoStream = struct {
447	}	447	}
448		448
449	pub const Source = union(enum) {	449	pub const Source = union(enum) {
450	file: std.fs.File,	450	file: Io.File,
451	stdio: std.fs.File,	451	stdio: Io.File,
452	memory: std.ArrayList(u8),	452	memory: std.ArrayList(u8),
453	/// The source has been closed and any usage of the Source in this state is illegal (except deinit).	453	/// The source has been closed and any usage of the Source in this state is illegal (except deinit).
454	closed: void,	454	closed: void,
...	@@ -500,10 +500,10 @@ const IoStream = struct {	...	@@ -500,10 +500,10 @@ const IoStream = struct {
500	}	500	}
501		501
502	pub const Writer = union(enum) {	502	pub const Writer = union(enum) {
503	file: std.fs.File.Writer,	503	file: Io.File.Writer,
504	allocating: std.Io.Writer.Allocating,	504	allocating: std.Io.Writer.Allocating,
505		505
506	pub const Error = Allocator.Error \|\| std.fs.File.WriteError;	506	pub const Error = Allocator.Error \|\| Io.File.WriteError;
507		507
508	pub fn interface(this: @This()) std.Io.Writer {	508	pub fn interface(this: @This()) std.Io.Writer {
509	return switch (this.*) {	509	return switch (this.*) {

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

...	@@ -32,8 +32,8 @@ pub fn openFileNotDir(	...	@@ -32,8 +32,8 @@ pub fn openFileNotDir(
32	cwd: std.fs.Dir,	32	cwd: std.fs.Dir,
33	io: Io,	33	io: Io,
34	path: []const u8,	34	path: []const u8,
35	flags: std.fs.File.OpenFlags,	35	flags: Io.File.OpenFlags,
36	) (std.fs.File.OpenError \|\| std.fs.File.StatError)!std.fs.File {	36	) (Io.File.OpenError \|\| Io.File.StatError)!Io.File {
37	const file = try cwd.openFile(io, path, flags);	37	const file = try cwd.openFile(io, path, flags);
38	errdefer file.close(io);	38	errdefer file.close(io);
39	// https://github.com/ziglang/zig/issues/5732	39	// https://github.com/ziglang/zig/issues/5732

lib/compiler/test_runner.zig+5-5

lib/compiler/translate-c/main.zig+7-6

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const Io = std.Io;
2	const assert = std.debug.assert;	3	const assert = std.debug.assert;
3	const mem = std.mem;	4	const mem = std.mem;
4	const process = std.process;	5	const process = std.process;
...	@@ -34,7 +35,7 @@ pub fn main() u8 {	...	@@ -34,7 +35,7 @@ pub fn main() u8 {
34	}	35	}
35		36
36	var stderr_buf: [1024]u8 = undefined;	37	var stderr_buf: [1024]u8 = undefined;
37	var stderr = std.fs.File.stderr().writer(&stderr_buf);	38	var stderr = Io.File.stderr().writer(&stderr_buf);
38	var diagnostics: aro.Diagnostics = switch (zig_integration) {	39	var diagnostics: aro.Diagnostics = switch (zig_integration) {
39	false => .{ .output = .{ .to_writer = .{	40	false => .{ .output = .{ .to_writer = .{
40	.color = .detect(stderr.file),	41	.color = .detect(stderr.file),
...	@@ -99,7 +100,7 @@ fn serveErrorBundle(arena: std.mem.Allocator, diagnostics: *const aro.Diagnostic	...	@@ -99,7 +100,7 @@ fn serveErrorBundle(arena: std.mem.Allocator, diagnostics: *const aro.Diagnostic
99	"translation failure",	100	"translation failure",
100	);	101	);
101	var stdout_buffer: [1024]u8 = undefined;	102	var stdout_buffer: [1024]u8 = undefined;
102	var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);	103	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
103	var server: std.zig.Server = .{	104	var server: std.zig.Server = .{
104	.out = &stdout_writer.interface,	105	.out = &stdout_writer.interface,
105	.in = undefined,	106	.in = undefined,
...	@@ -129,13 +130,13 @@ fn translate(d: aro.Driver, tc: aro.Toolchain, args: [][:0]u8, zig_integration	...	@@ -129,13 +130,13 @@ fn translate(d: aro.Driver, tc: aro.Toolchain, args: [][:0]u8, zig_integration
129	args[i] = arg;	130	args[i] = arg;
130	if (mem.eql(u8, arg, "--help")) {	131	if (mem.eql(u8, arg, "--help")) {
131	var stdout_buf: [512]u8 = undefined;	132	var stdout_buf: [512]u8 = undefined;
132	var stdout = std.fs.File.stdout().writer(&stdout_buf);	133	var stdout = Io.File.stdout().writer(&stdout_buf);
133	try stdout.interface.print(usage, .{args[0]});	134	try stdout.interface.print(usage, .{args[0]});
134	try stdout.interface.flush();	135	try stdout.interface.flush();
135	return;	136	return;
136	} else if (mem.eql(u8, arg, "--version")) {	137	} else if (mem.eql(u8, arg, "--version")) {
137	var stdout_buf: [512]u8 = undefined;	138	var stdout_buf: [512]u8 = undefined;
138	var stdout = std.fs.File.stdout().writer(&stdout_buf);	139	var stdout = Io.File.stdout().writer(&stdout_buf);
139	// TODO add version	140	// TODO add version
140	try stdout.interface.writeAll("0.0.0-dev\n");	141	try stdout.interface.writeAll("0.0.0-dev\n");
141	try stdout.interface.flush();	142	try stdout.interface.flush();
...	@@ -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	d.comp.cwd.createFile(path, .{}) catch \|er\|	229	d.comp.cwd.createFile(path, .{}) catch \|er\|
229	return d.fatal("unable to create dependency file '{s}': {s}", .{ path, aro.Driver.errorDescription(er) })	230	return d.fatal("unable to create dependency file '{s}': {s}", .{ path, aro.Driver.errorDescription(er) })
230	else	231	else
231	std.fs.File.stdout();	232	Io.File.stdout();
232	defer if (dep_file_name != null) file.close(io);	233	defer if (dep_file_name != null) file.close(io);
233		234
234	var file_writer = file.writer(&out_buf);	235	var file_writer = file.writer(&out_buf);
...	@@ -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		247
247	var close_out_file = false;	248	var close_out_file = false;
248	var out_file_path: []const u8 = "<stdout>";	249	var out_file_path: []const u8 = "<stdout>";
249	var out_file: std.fs.File = .stdout();	250	var out_file: Io.File = .stdout();
250	defer if (close_out_file) out_file.close(io);	251	defer if (close_out_file) out_file.close(io);
251		252
252	if (d.output_name) \|path\| blk: {	253	if (d.output_name) \|path\| blk: {

lib/std/Build.zig+3-3

...	@@ -1,3 +1,4 @@	...	@@ -1,3 +1,4 @@
		1	const Build = @This();
1	const builtin = @import("builtin");	2	const builtin = @import("builtin");
2		3
3	const std = @import("std.zig");	4	const std = @import("std.zig");
...	@@ -9,13 +10,12 @@ const panic = std.debug.panic;	...	@@ -9,13 +10,12 @@ const panic = std.debug.panic;
9	const assert = debug.assert;	10	const assert = debug.assert;
10	const log = std.log;	11	const log = std.log;
11	const StringHashMap = std.StringHashMap;	12	const StringHashMap = std.StringHashMap;
12	const Allocator = mem.Allocator;	13	const Allocator = std.mem.Allocator;
13	const Target = std.Target;	14	const Target = std.Target;
14	const process = std.process;	15	const process = std.process;
15	const EnvMap = std.process.EnvMap;	16	const EnvMap = std.process.EnvMap;
16	const File = fs.File;	17	const File = std.Io.File;
17	const Sha256 = std.crypto.hash.sha2.Sha256;	18	const Sha256 = std.crypto.hash.sha2.Sha256;
18	const Build = @This();
19	const ArrayList = std.ArrayList;	19	const ArrayList = std.ArrayList;
20		20
21	pub const Cache = @import("Build/Cache.zig");	21	pub const Cache = @import("Build/Cache.zig");

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

...	@@ -667,7 +667,7 @@ fn clearZigProcess(s: *Step, gpa: Allocator) void {	...	@@ -667,7 +667,7 @@ fn clearZigProcess(s: *Step, gpa: Allocator) void {
667	}	667	}
668	}	668	}
669		669
670	fn sendMessage(file: std.fs.File, tag: std.zig.Client.Message.Tag) !void {	670	fn sendMessage(file: Io.File, tag: std.zig.Client.Message.Tag) !void {
671	const header: std.zig.Client.Message.Header = .{	671	const header: std.zig.Client.Message.Header = .{
672	.tag = tag,	672	.tag = tag,
673	.bytes_len = 0,	673	.bytes_len = 0,

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

...	@@ -3,7 +3,7 @@ const ObjCopy = @This();	...	@@ -3,7 +3,7 @@ const ObjCopy = @This();
3		3
4	const Allocator = std.mem.Allocator;	4	const Allocator = std.mem.Allocator;
5	const ArenaAllocator = std.heap.ArenaAllocator;	5	const ArenaAllocator = std.heap.ArenaAllocator;
6	const File = std.fs.File;	6	const File = std.Io.File;
7	const InstallDir = std.Build.InstallDir;	7	const InstallDir = std.Build.InstallDir;
8	const Step = std.Build.Step;	8	const Step = std.Build.Step;
9	const elf = std.elf;	9	const elf = std.elf;

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

 @@ -1,15 +1,16 @@
-const std = @import("std");
+const Run = @This();
 const builtin = @import("builtin");
+const std = @import("std");
+const Io = std.Io;
 const Build = std.Build;
-const Step = Build.Step;
+const Step = std.Build.Step;
 const fs = std.fs;
 const mem = std.mem;
 const process = std.process;
-const EnvMap = process.EnvMap;
+const EnvMap = std.process.EnvMap;
 const assert = std.debug.assert;
-const Path = Build.Cache.Path;
+const Path = std.Build.Cache.Path;
-const Run = @This();
 pub const base_id: Step.Id = .run;
 @@ -2095,7 +2096,7 @@ pub const CachedTestMetadata = struct {
     }
 };
-fn requestNextTest(in: fs.File, metadata: *TestMetadata, sub_prog_node: *?std.Progress.Node) !void {
+fn requestNextTest(in: Io.File, metadata: *TestMetadata, sub_prog_node: *?std.Progress.Node) !void {
     while (metadata.next_index < metadata.names.len) {
         const i = metadata.next_index;
         metadata.next_index += 1;
 @@ -2114,7 +2115,7 @@ fn requestNextTest(in: fs.File, metadata: *TestMetadata, sub_prog_node: *?std.Pr
     }
 }
-fn sendMessage(file: std.fs.File, tag: std.zig.Client.Message.Tag) !void {
+fn sendMessage(file: Io.File, tag: std.zig.Client.Message.Tag) !void {
     const header: std.zig.Client.Message.Header = .{
         .tag = tag,
         .bytes_len = 0,
 @@ -2125,7 +2126,7 @@ fn sendMessage(file: std.fs.File, tag: std.zig.Client.Message.Tag) !void {
     };
 }
-fn sendRunTestMessage(file: std.fs.File, tag: std.zig.Client.Message.Tag, index: u32) !void {
+fn sendRunTestMessage(file: Io.File, tag: std.zig.Client.Message.Tag, index: u32) !void {
     const header: std.zig.Client.Message.Header = .{
         .tag = tag,
         .bytes_len = 4,
 @@ -2140,7 +2141,7 @@ fn sendRunTestMessage(file: std.fs.File, tag: std.zig.Client.Message.Tag, index:
 }
 fn sendRunFuzzTestMessage(
-    file: std.fs.File,
+    file: Io.File,
     index: u32,
     kind: std.Build.abi.fuzz.LimitKind,
     amount_or_instance: u64,

lib/std/Io.zig+1-1

...	@@ -528,7 +528,7 @@ pub fn Poller(comptime StreamEnum: type) type {	...	@@ -528,7 +528,7 @@ pub fn Poller(comptime StreamEnum: type) type {
528	/// Given an enum, returns a struct with fields of that enum, each field	528	/// Given an enum, returns a struct with fields of that enum, each field
529	/// representing an I/O stream for polling.	529	/// representing an I/O stream for polling.
530	pub fn PollFiles(comptime StreamEnum: type) type {	530	pub fn PollFiles(comptime StreamEnum: type) type {
531	return @Struct(.auto, null, std.meta.fieldNames(StreamEnum), &@splat(std.fs.File), &@splat(.{}));	531	return @Struct(.auto, null, std.meta.fieldNames(StreamEnum), &@splat(Io.File), &@splat(.{}));
532	}	532	}
533		533
534	test {	534	test {

lib/std/Io/Writer.zig+5-4

lib/std/Io/test.zig+1-1

...	@@ -10,7 +10,7 @@ const expectError = std.testing.expectError;	...	@@ -10,7 +10,7 @@ const expectError = std.testing.expectError;
10	const DefaultPrng = std.Random.DefaultPrng;	10	const DefaultPrng = std.Random.DefaultPrng;
11	const mem = std.mem;	11	const mem = std.mem;
12	const fs = std.fs;	12	const fs = std.fs;
13	const File = std.fs.File;	13	const File = std.Io.File;
14	const assert = std.debug.assert;	14	const assert = std.debug.assert;
15		15
16	const tmpDir = std.testing.tmpDir;	16	const tmpDir = std.testing.tmpDir;

lib/std/Io/tty.zig+4-3

 @@ -1,9 +1,10 @@
-const std = @import("std");
 const builtin = @import("builtin");
-const File = std.fs.File;
+const native_os = builtin.os.tag;
+const std = @import("std");
+const File = std.Io.File;
 const process = std.process;
 const windows = std.os.windows;
-const native_os = builtin.os.tag;
 pub const Color = enum {
     black,

lib/std/Progress.zig+10-8

 @@ -1,19 +1,21 @@
 //! This API is non-allocating, non-fallible, thread-safe, and lock-free.
+const Progress = @This();
-const std = @import("std");
 const builtin = @import("builtin");
+const is_big_endian = builtin.cpu.arch.endian() == .big;
+const is_windows = builtin.os.tag == .windows;
+const std = @import("std");
+const Io = std.Io;
 const windows = std.os.windows;
 const testing = std.testing;
 const assert = std.debug.assert;
-const Progress = @This();
 const posix = std.posix;
-const is_big_endian = builtin.cpu.arch.endian() == .big;
-const is_windows = builtin.os.tag == .windows;
 const Writer = std.Io.Writer;
 /// `null` if the current node (and its children) should
 /// not print on update()
-terminal: std.fs.File,
+terminal: Io.File,
 terminal_mode: TerminalMode,
 @@ -472,7 +474,7 @@ pub fn start(options: Options) Node {
             if (options.disable_printing) {
                 return Node.none;
             }
-            const stderr: std.fs.File = .stderr();
+            const stderr: Io.File = .stderr();
             global_progress.terminal = stderr;
             if (stderr.enableAnsiEscapeCodes()) |_| {
                 global_progress.terminal_mode = .ansi_escape_codes;
 @@ -633,8 +635,8 @@ pub fn unlockStdErr() void {
 /// Protected by `stderr_mutex`.
 const stderr_writer: *Writer = &stderr_file_writer.interface;
 /// Protected by `stderr_mutex`.
-var stderr_file_writer: std.fs.File.Writer = .{
+var stderr_file_writer: Io.File.Writer = .{
-    .interface = std.fs.File.Writer.initInterface(&.{}),
+    .interface = Io.File.Writer.initInterface(&.{}),
     .file = if (is_windows) undefined else .stderr(),
     .mode = .streaming,
 };

lib/std/Random/benchmark.zig+4-2

...	@@ -1,7 +1,9 @@	...	@@ -1,7 +1,9 @@
1	// zig run -O ReleaseFast --zig-lib-dir ../.. benchmark.zig	1	// zig run -O ReleaseFast --zig-lib-dir ../.. benchmark.zig
2		2
3	const std = @import("std");
4	const builtin = @import("builtin");	3	const builtin = @import("builtin");
		4
		5	const std = @import("std");
		6	const Io = std.Io;
5	const time = std.time;	7	const time = std.time;
6	const Timer = time.Timer;	8	const Timer = time.Timer;
7	const Random = std.Random;	9	const Random = std.Random;
...	@@ -123,7 +125,7 @@ fn mode(comptime x: comptime_int) comptime_int {	...	@@ -123,7 +125,7 @@ fn mode(comptime x: comptime_int) comptime_int {
123		125
124	pub fn main() !void {	126	pub fn main() !void {
125	var stdout_buffer: [0x100]u8 = undefined;	127	var stdout_buffer: [0x100]u8 = undefined;
126	var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);	128	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
127	const stdout = &stdout_writer.interface;	129	const stdout = &stdout_writer.interface;
128		130
129	var buffer: [1024]u8 = undefined;	131	var buffer: [1024]u8 = undefined;

lib/std/Thread.zig+2-2

...	@@ -175,7 +175,7 @@ pub const SetNameError = error{	...	@@ -175,7 +175,7 @@ pub const SetNameError = error{
175	Unsupported,	175	Unsupported,
176	Unexpected,	176	Unexpected,
177	InvalidWtf8,	177	InvalidWtf8,
178	} \|\| posix.PrctlError \|\| posix.WriteError \|\| std.fs.File.OpenError \|\| std.fmt.BufPrintError;	178	} \|\| posix.PrctlError \|\| posix.WriteError \|\| Io.File.OpenError \|\| std.fmt.BufPrintError;
179		179
180	pub fn setName(self: Thread, io: Io, name: []const u8) SetNameError!void {	180	pub fn setName(self: Thread, io: Io, name: []const u8) SetNameError!void {
181	if (name.len > max_name_len) return error.NameTooLong;	181	if (name.len > max_name_len) return error.NameTooLong;
...	@@ -293,7 +293,7 @@ pub fn setName(self: Thread, io: Io, name: []const u8) SetNameError!void {	...	@@ -293,7 +293,7 @@ pub fn setName(self: Thread, io: Io, name: []const u8) SetNameError!void {
293	pub const GetNameError = error{	293	pub const GetNameError = error{
294	Unsupported,	294	Unsupported,
295	Unexpected,	295	Unexpected,
296	} \|\| posix.PrctlError \|\| posix.ReadError \|\| std.fs.File.OpenError \|\| std.fmt.BufPrintError;	296	} \|\| posix.PrctlError \|\| posix.ReadError \|\| Io.File.OpenError \|\| std.fmt.BufPrintError;
297		297
298	/// On Windows, the result is encoded as [WTF-8](https://wtf-8.codeberg.page/).	298	/// On Windows, the result is encoded as [WTF-8](https://wtf-8.codeberg.page/).
299	/// On other platforms, the result is an opaque sequence of bytes with no particular encoding.	299	/// On other platforms, the result is an opaque sequence of bytes with no particular encoding.

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

...	@@ -171,7 +171,7 @@ fn rescanWindows(cb: *Bundle, gpa: Allocator, io: Io, now: Io.Timestamp) RescanW	...	@@ -171,7 +171,7 @@ fn rescanWindows(cb: *Bundle, gpa: Allocator, io: Io, now: Io.Timestamp) RescanW
171	cb.bytes.shrinkAndFree(gpa, cb.bytes.items.len);	171	cb.bytes.shrinkAndFree(gpa, cb.bytes.items.len);
172	}	172	}
173		173
174	pub const AddCertsFromDirPathError = fs.File.OpenError \|\| AddCertsFromDirError;	174	pub const AddCertsFromDirPathError = Io.File.OpenError \|\| AddCertsFromDirError;
175		175
176	pub fn addCertsFromDirPath(	176	pub fn addCertsFromDirPath(
177	cb: *Bundle,	177	cb: *Bundle,
...	@@ -212,7 +212,7 @@ pub fn addCertsFromDir(cb: *Bundle, gpa: Allocator, io: Io, now: Io.Timestamp, i	...	@@ -212,7 +212,7 @@ pub fn addCertsFromDir(cb: *Bundle, gpa: Allocator, io: Io, now: Io.Timestamp, i
212	}	212	}
213	}	213	}
214		214
215	pub const AddCertsFromFilePathError = fs.File.OpenError \|\| AddCertsFromFileError \|\| Io.Clock.Error;	215	pub const AddCertsFromFilePathError = Io.File.OpenError \|\| AddCertsFromFileError \|\| Io.Clock.Error;
216		216
217	pub fn addCertsFromFilePathAbsolute(	217	pub fn addCertsFromFilePathAbsolute(
218	cb: *Bundle,	218	cb: *Bundle,
...	@@ -242,8 +242,8 @@ pub fn addCertsFromFilePath(	...	@@ -242,8 +242,8 @@ pub fn addCertsFromFilePath(
242	}	242	}
243		243
244	pub const AddCertsFromFileError = Allocator.Error \|\|	244	pub const AddCertsFromFileError = Allocator.Error \|\|
245	fs.File.GetSeekPosError \|\|	245	Io.File.GetSeekPosError \|\|
246	fs.File.ReadError \|\|	246	Io.File.ReadError \|\|
247	ParseCertError \|\|	247	ParseCertError \|\|
248	std.base64.Error \|\|	248	std.base64.Error \|\|
249	error{ CertificateAuthorityBundleTooBig, MissingEndCertificateMarker, Streaming };	249	error{ CertificateAuthorityBundleTooBig, MissingEndCertificateMarker, Streaming };

lib/std/crypto/Certificate/Bundle/macos.zig+1-1

...	@@ -6,7 +6,7 @@ const mem = std.mem;	...	@@ -6,7 +6,7 @@ const mem = std.mem;
6	const Allocator = std.mem.Allocator;	6	const Allocator = std.mem.Allocator;
7	const Bundle = @import("../Bundle.zig");	7	const Bundle = @import("../Bundle.zig");
8		8
9	pub const RescanMacError = Allocator.Error \|\| fs.File.OpenError \|\| fs.File.ReadError \|\| fs.File.SeekError \|\| Bundle.ParseCertError \|\| error{EndOfStream};	9	pub const RescanMacError = Allocator.Error \|\| Io.File.OpenError \|\| Io.File.ReadError \|\| Io.File.SeekError \|\| Bundle.ParseCertError \|\| error{EndOfStream};
10		10
11	pub fn rescanMac(cb: *Bundle, gpa: Allocator, io: Io, now: Io.Timestamp) RescanMacError!void {	11	pub fn rescanMac(cb: *Bundle, gpa: Allocator, io: Io, now: Io.Timestamp) RescanMacError!void {
12	cb.bytes.clearRetainingCapacity();	12	cb.bytes.clearRetainingCapacity();

lib/std/crypto/benchmark.zig+5-3

 @@ -1,10 +1,12 @@
 // zig run -O ReleaseFast --zig-lib-dir ../.. benchmark.zig
-const std = @import("std");
 const builtin = @import("builtin");
+const std = @import("std");
+const Io = std.Io;
 const mem = std.mem;
 const time = std.time;
-const Timer = time.Timer;
+const Timer = std.time.Timer;
 const crypto = std.crypto;
 const KiB = 1024;
 @@ -504,7 +506,7 @@ fn mode(comptime x: comptime_int) comptime_int {
 pub fn main() !void {
     // Size of buffer is about size of printed message.
     var stdout_buffer: [0x100]u8 = undefined;
-    var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
+    var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
     const stdout = &stdout_writer.interface;
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);

lib/std/debug.zig+3-3

lib/std/debug/ElfFile.zig+2-2

...	@@ -123,7 +123,7 @@ pub const LoadError = error{	...	@@ -123,7 +123,7 @@ pub const LoadError = error{
123		123
124	pub fn load(	124	pub fn load(
125	gpa: Allocator,	125	gpa: Allocator,
126	elf_file: std.fs.File,	126	elf_file: Io.File,
127	opt_build_id: ?[]const u8,	127	opt_build_id: ?[]const u8,
128	di_search_paths: *const DebugInfoSearchPaths,	128	di_search_paths: *const DebugInfoSearchPaths,
129	) LoadError!ElfFile {	129	) LoadError!ElfFile {
...	@@ -423,7 +423,7 @@ const LoadInnerResult = struct {	...	@@ -423,7 +423,7 @@ const LoadInnerResult = struct {
423	};	423	};
424	fn loadInner(	424	fn loadInner(
425	arena: Allocator,	425	arena: Allocator,
426	elf_file: std.fs.File,	426	elf_file: Io.File,
427	opt_crc: ?u32,	427	opt_crc: ?u32,
428	) (LoadError \|\| error{ CrcMismatch, Streaming, Canceled })!LoadInnerResult {	428	) (LoadError \|\| error{ CrcMismatch, Streaming, Canceled })!LoadInnerResult {
429	const mapped_mem: []align(std.heap.page_size_min) const u8 = mapped: {	429	const mapped_mem: []align(std.heap.page_size_min) const u8 = mapped: {

lib/std/debug/Info.zig+1-1

...	@@ -27,7 +27,7 @@ coverage: *Coverage,	...	@@ -27,7 +27,7 @@ coverage: *Coverage,
27	pub const LoadError = error{	27	pub const LoadError = error{
28	MissingDebugInfo,	28	MissingDebugInfo,
29	UnsupportedDebugInfo,	29	UnsupportedDebugInfo,
30	} \|\| std.fs.File.OpenError \|\| ElfFile.LoadError \|\| MachOFile.Error \|\| std.debug.Dwarf.ScanError;	30	} \|\| Io.File.OpenError \|\| ElfFile.LoadError \|\| MachOFile.Error \|\| std.debug.Dwarf.ScanError;
31		31
32	pub fn load(	32	pub fn load(
33	gpa: Allocator,	33	gpa: Allocator,

lib/std/debug/Pdb.zig+1-1

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	const std = @import("../std.zig");	1	const std = @import("../std.zig");
2	const File = std.fs.File;	2	const File = std.Io.File;
3	const Allocator = std.mem.Allocator;	3	const Allocator = std.mem.Allocator;
4	const pdb = std.pdb;	4	const pdb = std.pdb;
5	const assert = std.debug.assert;	5	const assert = std.debug.assert;

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

...	@@ -204,7 +204,7 @@ const Module = struct {	...	@@ -204,7 +204,7 @@ const Module = struct {
204	coff_section_headers: []coff.SectionHeader,	204	coff_section_headers: []coff.SectionHeader,
205		205
206	const MappedFile = struct {	206	const MappedFile = struct {
207	file: fs.File,	207	file: Io.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, io: Io) void {	210	fn deinit(mf: *const MappedFile, io: Io) void {

lib/std/debug/simple_panic.zig+1-1

...	@@ -15,7 +15,7 @@ pub fn call(msg: []const u8, ra: ?usize) noreturn {	...	@@ -15,7 +15,7 @@ pub fn call(msg: []const u8, ra: ?usize) noreturn {
15	@branchHint(.cold);	15	@branchHint(.cold);
16	_ = ra;	16	_ = ra;
17	std.debug.lockStdErr();	17	std.debug.lockStdErr();
18	const stderr: std.fs.File = .stderr();	18	const stderr: std.Io.File = .stderr();
19	stderr.writeAll(msg) catch {};	19	stderr.writeAll(msg) catch {};
20	@trap();	20	@trap();
21	}	21	}

lib/std/dynamic_library.zig+1-1

...	@@ -225,7 +225,7 @@ pub const ElfDynLib = struct {	...	@@ -225,7 +225,7 @@ pub const ElfDynLib = struct {
225	const fd = try resolveFromName(io, path);	225	const fd = try resolveFromName(io, path);
226	defer posix.close(fd);	226	defer posix.close(fd);
227		227
228	const file: std.fs.File = .{ .handle = fd };	228	const file: Io.File = .{ .handle = fd };
229	const stat = try file.stat();	229	const stat = try file.stat();
230	const size = std.math.cast(usize, stat.size) orelse return error.FileTooBig;	230	const size = std.math.cast(usize, stat.size) orelse return error.FileTooBig;
231		231

lib/std/fs/test.zig+4-4

...	@@ -12,7 +12,7 @@ const posix = std.posix;	...	@@ -12,7 +12,7 @@ const posix = std.posix;
12		12
13	const ArenaAllocator = std.heap.ArenaAllocator;	13	const ArenaAllocator = std.heap.ArenaAllocator;
14	const Dir = std.fs.Dir;	14	const Dir = std.fs.Dir;
15	const File = std.fs.File;	15	const File = std.Io.File;
16	const tmpDir = testing.tmpDir;	16	const tmpDir = testing.tmpDir;
17	const SymLinkFlags = std.fs.Dir.SymLinkFlags;	17	const SymLinkFlags = std.fs.Dir.SymLinkFlags;
18		18
...	@@ -2231,7 +2231,7 @@ test "read file non vectored" {	...	@@ -2231,7 +2231,7 @@ test "read file non vectored" {
2231	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });	2231	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });
2232	defer file.close(io);	2232	defer file.close(io);
2233	{	2233	{
2234	var file_writer: std.fs.File.Writer = .init(file, &.{});	2234	var file_writer: File.Writer = .init(file, &.{});
2235	try file_writer.interface.writeAll(contents);	2235	try file_writer.interface.writeAll(contents);
2236	try file_writer.interface.flush();	2236	try file_writer.interface.flush();
2237	}	2237	}
...	@@ -2263,7 +2263,7 @@ test "seek keeping partial buffer" {	...	@@ -2263,7 +2263,7 @@ test "seek keeping partial buffer" {
2263	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });	2263	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });
2264	defer file.close(io);	2264	defer file.close(io);
2265	{	2265	{
2266	var file_writer: std.fs.File.Writer = .init(file, &.{});	2266	var file_writer: File.Writer = .init(file, &.{});
2267	try file_writer.interface.writeAll(contents);	2267	try file_writer.interface.writeAll(contents);
2268	try file_writer.interface.flush();	2268	try file_writer.interface.flush();
2269	}	2269	}
...	@@ -2325,7 +2325,7 @@ test "seekTo flushes buffered data" {	...	@@ -2325,7 +2325,7 @@ test "seekTo flushes buffered data" {
2325	defer file.close(io);	2325	defer file.close(io);
2326	{	2326	{
2327	var buf: [16]u8 = undefined;	2327	var buf: [16]u8 = undefined;
2328	var file_writer = std.fs.File.writer(file, &buf);	2328	var file_writer = File.writer(file, &buf);
2329		2329
2330	try file_writer.interface.writeAll(contents);	2330	try file_writer.interface.writeAll(contents);
2331	try file_writer.seekTo(8);	2331	try file_writer.seekTo(8);

lib/std/hash/benchmark.zig+3-2

...	@@ -1,7 +1,8 @@	...	@@ -1,7 +1,8 @@
1	// zig run -O ReleaseFast --zig-lib-dir ../.. benchmark.zig	1	// zig run -O ReleaseFast --zig-lib-dir ../.. benchmark.zig
		2	const builtin = @import("builtin");
2		3
3	const std = @import("std");	4	const std = @import("std");
4	const builtin = @import("builtin");	5	const Io = std.Io;
5	const time = std.time;	6	const time = std.time;
6	const Timer = time.Timer;	7	const Timer = time.Timer;
7	const hash = std.hash;	8	const hash = std.hash;
...	@@ -354,7 +355,7 @@ fn mode(comptime x: comptime_int) comptime_int {	...	@@ -354,7 +355,7 @@ fn mode(comptime x: comptime_int) comptime_int {
354		355
355	pub fn main() !void {	356	pub fn main() !void {
356	var stdout_buffer: [0x100]u8 = undefined;	357	var stdout_buffer: [0x100]u8 = undefined;
357	var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);	358	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
358	const stdout = &stdout_writer.interface;	359	const stdout = &stdout_writer.interface;
359		360
360	var buffer: [1024]u8 = undefined;	361	var buffer: [1024]u8 = undefined;

lib/std/http.zig+1-1

...	@@ -2,7 +2,7 @@ const builtin = @import("builtin");	...	@@ -2,7 +2,7 @@ const builtin = @import("builtin");
2	const std = @import("std.zig");	2	const std = @import("std.zig");
3	const assert = std.debug.assert;	3	const assert = std.debug.assert;
4	const Writer = std.Io.Writer;	4	const Writer = std.Io.Writer;
5	const File = std.fs.File;	5	const File = std.Io.File;
6		6
7	pub const Client = @import("http/Client.zig");	7	pub const Client = @import("http/Client.zig");
8	pub const Server = @import("http/Server.zig");	8	pub const Server = @import("http/Server.zig");

lib/std/pdb.zig+1-1

...	@@ -12,7 +12,7 @@ const math = std.math;	...	@@ -12,7 +12,7 @@ const math = std.math;
12	const mem = std.mem;	12	const mem = std.mem;
13	const coff = std.coff;	13	const coff = std.coff;
14	const fs = std.fs;	14	const fs = std.fs;
15	const File = std.fs.File;	15	const File = std.Io.File;
16	const debug = std.debug;	16	const debug = std.debug;
17		17
18	const ArrayList = std.ArrayList;	18	const ArrayList = std.ArrayList;

lib/std/posix/test.zig+9-9

 @@ -1,20 +1,20 @@
+const builtin = @import("builtin");
+const native_os = builtin.target.os.tag;
 const std = @import("../std.zig");
+const Io = std.Io;
 const posix = std.posix;
 const testing = std.testing;
-const expect = testing.expect;
+const expect = std.testing.expect;
-const expectEqual = testing.expectEqual;
+const expectEqual = std.testing.expectEqual;
-const expectError = testing.expectError;
+const expectError = std.testing.expectError;
 const fs = std.fs;
 const mem = std.mem;
 const elf = std.elf;
 const linux = std.os.linux;
 const a = std.testing.allocator;
-const builtin = @import("builtin");
 const AtomicRmwOp = std.builtin.AtomicRmwOp;
 const AtomicOrder = std.builtin.AtomicOrder;
-const native_os = builtin.target.os.tag;
 const tmpDir = std.testing.tmpDir;
 const AT = posix.AT;
 @@ -663,14 +663,14 @@ test "dup & dup2" {
         var file = try tmp.dir.createFile("os_dup_test", .{});
         defer file.close(io);
-        var duped = std.fs.File{ .handle = try posix.dup(file.handle) };
+        var duped = Io.File{ .handle = try posix.dup(file.handle) };
         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 };
+        var dup2ed = Io.File{ .handle = new_fd };
         defer dup2ed.close(io);
         try dup2ed.writeAll("dup2");
     }

lib/std/process/Child.zig+2-2

...	@@ -8,7 +8,7 @@ const Io = std.Io;	...	@@ -8,7 +8,7 @@ const Io = std.Io;
8	const unicode = std.unicode;	8	const unicode = std.unicode;
9	const fs = std.fs;	9	const fs = std.fs;
10	const process = std.process;	10	const process = std.process;
11	const File = std.fs.File;	11	const File = std.Io.File;
12	const windows = std.os.windows;	12	const windows = std.os.windows;
13	const linux = std.os.linux;	13	const linux = std.os.linux;
14	const posix = std.posix;	14	const posix = std.posix;
...	@@ -1055,7 +1055,7 @@ fn forkChildErrReport(fd: i32, err: ChildProcess.SpawnError) noreturn {	...	@@ -1055,7 +1055,7 @@ fn forkChildErrReport(fd: i32, err: ChildProcess.SpawnError) noreturn {
1055		1055
1056	fn writeIntFd(fd: i32, value: ErrInt) !void {	1056	fn writeIntFd(fd: i32, value: ErrInt) !void {
1057	var buffer: [8]u8 = undefined;	1057	var buffer: [8]u8 = undefined;
1058	var fw: std.fs.File.Writer = .initStreaming(.{ .handle = fd }, &buffer);	1058	var fw: File.Writer = .initStreaming(.{ .handle = fd }, &buffer);
1059	fw.interface.writeInt(u64, value, .little) catch unreachable;	1059	fw.interface.writeInt(u64, value, .little) catch unreachable;
1060	fw.interface.flush() catch return error.SystemResources;	1060	fw.interface.flush() catch return error.SystemResources;
1061	}	1061	}

lib/std/unicode/throughput_test.zig+3-3

...	@@ -1,8 +1,8 @@	...	@@ -1,8 +1,8 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const Io = std.Io;
2	const time = std.time;	3	const time = std.time;
3	const unicode = std.unicode;	4	const unicode = std.unicode;
4		5	const Timer = std.time.Timer;
5	const Timer = time.Timer;
6		6
7	const N = 1_000_000;	7	const N = 1_000_000;
8		8
...	@@ -41,7 +41,7 @@ fn benchmarkCodepointCount(buf: []const u8) !ResultCount {	...	@@ -41,7 +41,7 @@ fn benchmarkCodepointCount(buf: []const u8) !ResultCount {
41	pub fn main() !void {	41	pub fn main() !void {
42	// Size of buffer is about size of printed message.	42	// Size of buffer is about size of printed message.
43	var stdout_buffer: [0x100]u8 = undefined;	43	var stdout_buffer: [0x100]u8 = undefined;
44	var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);	44	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
45	const stdout = &stdout_writer.interface;	45	const stdout = &stdout_writer.interface;
46		46
47	try stdout.print("short ASCII strings\n", .{});	47	try stdout.print("short ASCII strings\n", .{});

lib/std/zig/Zir.zig+4-4

...	@@ -11,9 +11,11 @@	...	@@ -11,9 +11,11 @@
11	//! * In the future, possibly inline assembly, which needs to get parsed and	11	//! * In the future, possibly inline assembly, which needs to get parsed and
12	//! handled by the codegen backend, and errors reported there. However for now,	12	//! handled by the codegen backend, and errors reported there. However for now,
13	//! inline assembly is not an exception.	13	//! inline assembly is not an exception.
		14	const Zir = @This();
		15	const builtin = @import("builtin");
14		16
15	const std = @import("std");	17	const std = @import("std");
16	const builtin = @import("builtin");	18	const Io = std.Io;
17	const mem = std.mem;	19	const mem = std.mem;
18	const Allocator = std.mem.Allocator;	20	const Allocator = std.mem.Allocator;
19	const assert = std.debug.assert;	21	const assert = std.debug.assert;
...	@@ -21,8 +23,6 @@ const BigIntConst = std.math.big.int.Const;	...	@@ -21,8 +23,6 @@ const BigIntConst = std.math.big.int.Const;
21	const BigIntMutable = std.math.big.int.Mutable;	23	const BigIntMutable = std.math.big.int.Mutable;
22	const Ast = std.zig.Ast;	24	const Ast = std.zig.Ast;
23		25
24	const Zir = @This();
25
26	instructions: std.MultiArrayList(Inst).Slice,	26	instructions: std.MultiArrayList(Inst).Slice,
27	/// In order to store references to strings in fewer bytes, we copy all	27	/// In order to store references to strings in fewer bytes, we copy all
28	/// string bytes into here. String bytes can be null. It is up to whomever	28	/// string bytes into here. String bytes can be null. It is up to whomever
...	@@ -45,7 +45,7 @@ pub const Header = extern struct {	...	@@ -45,7 +45,7 @@ pub const Header = extern struct {
45	/// it's essentially free to have a zero field here and makes the warning go away,	45	/// it's essentially free to have a zero field here and makes the warning go away,
46	/// making it more likely that following Valgrind warnings will be taken seriously.	46	/// making it more likely that following Valgrind warnings will be taken seriously.
47	unused: u32 = 0,	47	unused: u32 = 0,
48	stat_inode: std.fs.File.INode,	48	stat_inode: Io.File.INode,
49	stat_size: u64,	49	stat_size: u64,
50	stat_mtime: i128,	50	stat_mtime: i128,
51	};	51	};

lib/std/zig/Zoir.zig+8-7

 @@ -1,6 +1,13 @@
 //! Zig Object Intermediate Representation.
 //! Simplified AST for the ZON (Zig Object Notation) format.
 //! `ZonGen` converts `Ast` to `Zoir`.
+const Zoir = @This();
+const std = @import("std");
+const Io = std.Io;
+const assert = std.debug.assert;
+const Allocator = std.mem.Allocator;
+const Ast = std.zig.Ast;
 nodes: std.MultiArrayList(Node.Repr).Slice,
 extra: []u32,
 @@ -25,7 +32,7 @@ pub const Header = extern struct {
     /// making it more likely that following Valgrind warnings will be taken seriously.
     unused: u64 = 0,
-    stat_inode: std.fs.File.INode,
+    stat_inode: Io.File.INode,
     stat_size: u64,
     stat_mtime: i128,
 @@ -254,9 +261,3 @@ pub const CompileError = extern struct {
         assert(std.meta.hasUniqueRepresentation(Note));
     }
 };
-const std = @import("std");
-const assert = std.debug.assert;
-const Allocator = std.mem.Allocator;
-const Ast = std.zig.Ast;
-const Zoir = @This();

lib/std/zig/llvm/Builder.zig+2-2

...	@@ -9578,7 +9578,7 @@ pub fn asmValue(	...	@@ -9578,7 +9578,7 @@ pub fn asmValue(
9578		9578
9579	pub fn dump(b: *Builder) void {	9579	pub fn dump(b: *Builder) void {
9580	var buffer: [4000]u8 = undefined;	9580	var buffer: [4000]u8 = undefined;
9581	const stderr: std.fs.File = .stderr();	9581	const stderr: Io.File = .stderr();
9582	b.printToFile(stderr, &buffer) catch {};	9582	b.printToFile(stderr, &buffer) catch {};
9583	}	9583	}
9584		9584
...	@@ -9589,7 +9589,7 @@ pub fn printToFilePath(b: *Builder, io: Io, dir: std.fs.Dir, path: []const u8) !	...	@@ -9589,7 +9589,7 @@ pub fn printToFilePath(b: *Builder, io: Io, dir: std.fs.Dir, path: []const u8) !
9589	try b.printToFile(io, file, &buffer);	9589	try b.printToFile(io, file, &buffer);
9590	}	9590	}
9591		9591
9592	pub fn printToFile(b: *Builder, file: std.fs.File, buffer: []u8) !void {	9592	pub fn printToFile(b: *Builder, file: Io.File, buffer: []u8) !void {
9593	var fw = file.writer(buffer);	9593	var fw = file.writer(buffer);
9594	try print(b, &fw.interface);	9594	try print(b, &fw.interface);
9595	try fw.interface.flush();	9595	try fw.interface.flush();

lib/std/zig/perf_test.zig+2-1

...	@@ -1,4 +1,5 @@	...	@@ -1,4 +1,5 @@
1	const std = @import("std");	1	const std = @import("std");
		2	const Io = std.Io;
2	const mem = std.mem;	3	const mem = std.mem;
3	const Tokenizer = std.zig.Tokenizer;	4	const Tokenizer = std.zig.Tokenizer;
4	const fmtIntSizeBin = std.fmt.fmtIntSizeBin;	5	const fmtIntSizeBin = std.fmt.fmtIntSizeBin;
...	@@ -22,7 +23,7 @@ pub fn main() !void {	...	@@ -22,7 +23,7 @@ pub fn main() !void {
22	const bytes_per_sec = @as(u64, @intFromFloat(@floor(bytes_per_sec_float)));	23	const bytes_per_sec = @as(u64, @intFromFloat(@floor(bytes_per_sec_float)));
23		24
24	var stdout_buffer: [1024]u8 = undefined;	25	var stdout_buffer: [1024]u8 = undefined;
25	var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);	26	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
26	const stdout = &stdout_writer.interface;	27	const stdout = &stdout_writer.interface;
27	try stdout.print("parsing speed: {Bi:.2}/s, {Bi:.2} used \n", .{ bytes_per_sec, memory_used });	28	try stdout.print("parsing speed: {Bi:.2}/s, {Bi:.2} used \n", .{ bytes_per_sec, memory_used });
28	try stdout.flush();	29	try stdout.flush();

lib/std/zip.zig+3-2

 @@ -4,9 +4,10 @@
 //! Note that this file uses the abbreviation "cd" for "central directory"
 const builtin = @import("builtin");
-const std = @import("std");
-const File = std.fs.File;
 const is_le = builtin.target.cpu.arch.endian() == .little;
+const std = @import("std");
+const File = std.Io.File;
 const Writer = std.Io.Writer;
 const Reader = std.Io.Reader;
 const flate = std.compress.flate;

src/Compilation.zig+2-2

...	@@ -5325,7 +5325,7 @@ fn docsCopyModule(	...	@@ -5325,7 +5325,7 @@ fn docsCopyModule(
5325	comp: *Compilation,	5325	comp: *Compilation,
5326	module: *Package.Module,	5326	module: *Package.Module,
5327	name: []const u8,	5327	name: []const u8,
5328	tar_file_writer: *fs.File.Writer,	5328	tar_file_writer: *Io.File.Writer,
5329	) !void {	5329	) !void {
5330	const io = comp.io;	5330	const io = comp.io;
5331	const root = module.root;	5331	const root = module.root;
...	@@ -5361,7 +5361,7 @@ fn docsCopyModule(	...	@@ -5361,7 +5361,7 @@ fn docsCopyModule(
5361	};	5361	};
5362	defer file.close(io);	5362	defer file.close(io);
5363	const stat = try file.stat();	5363	const stat = try file.stat();
5364	var file_reader: fs.File.Reader = .initSize(file.adaptToNewApi(), io, &buffer, stat.size);	5364	var file_reader: Io.File.Reader = .initSize(file.adaptToNewApi(), io, &buffer, stat.size);
5365		5365
5366	archiver.writeFileTimestamp(entry.path, &file_reader, stat.mtime) catch \|err\| {	5366	archiver.writeFileTimestamp(entry.path, &file_reader, stat.mtime) catch \|err\| {
5367	return comp.lockAndSetMiscFailure(.docs_copy, "unable to archive {f}{s}: {t}", .{	5367	return comp.lockAndSetMiscFailure(.docs_copy, "unable to archive {f}{s}: {t}", .{

src/Package/Fetch.zig+8-8

...	@@ -882,7 +882,7 @@ fn fail(f: *Fetch, msg_tok: std.zig.Ast.TokenIndex, msg_str: u32) RunError {	...	@@ -882,7 +882,7 @@ fn fail(f: *Fetch, msg_tok: std.zig.Ast.TokenIndex, msg_str: u32) RunError {
882	}	882	}
883		883
884	const Resource = union(enum) {	884	const Resource = union(enum) {
885	file: fs.File.Reader,	885	file: Io.File.Reader,
886	http_request: HttpRequest,	886	http_request: HttpRequest,
887	git: Git,	887	git: Git,
888	dir: Io.Dir,	888	dir: Io.Dir,
...	@@ -1653,7 +1653,7 @@ fn computeHash(f: *Fetch, pkg_path: Cache.Path, filter: Filter) RunError!Compute	...	@@ -1653,7 +1653,7 @@ fn computeHash(f: *Fetch, pkg_path: Cache.Path, filter: Filter) RunError!Compute
1653		1653
1654	fn dumpHashInfo(all_files: []const *const HashedFile) !void {	1654	fn dumpHashInfo(all_files: []const *const HashedFile) !void {
1655	var stdout_buffer: [1024]u8 = undefined;	1655	var stdout_buffer: [1024]u8 = undefined;
1656	var stdout_writer: fs.File.Writer = .initStreaming(.stdout(), &stdout_buffer);	1656	var stdout_writer: Io.File.Writer = .initStreaming(.stdout(), &stdout_buffer);
1657	const w = &stdout_writer.interface;	1657	const w = &stdout_writer.interface;
1658	for (all_files) \|hashed_file\| {	1658	for (all_files) \|hashed_file\| {
1659	try w.print("{t}: {x}: {s}\n", .{ hashed_file.kind, &hashed_file.hash, hashed_file.normalized_path });	1659	try w.print("{t}: {x}: {s}\n", .{ hashed_file.kind, &hashed_file.hash, hashed_file.normalized_path });
...	@@ -1712,11 +1712,11 @@ fn deleteFileFallible(dir: Io.Dir, deleted_file: *DeletedFile) DeletedFile.Error	...	@@ -1712,11 +1712,11 @@ fn deleteFileFallible(dir: Io.Dir, deleted_file: *DeletedFile) DeletedFile.Error
1712	try dir.deleteFile(deleted_file.fs_path);	1712	try dir.deleteFile(deleted_file.fs_path);
1713	}	1713	}
1714		1714
1715	fn setExecutable(file: fs.File) !void {	1715	fn setExecutable(file: Io.File) !void {
1716	if (!std.fs.has_executable_bit) return;	1716	if (!std.fs.has_executable_bit) return;
1717		1717
1718	const S = std.posix.S;	1718	const S = std.posix.S;
1719	const mode = fs.File.default_mode \| S.IXUSR \| S.IXGRP \| S.IXOTH;	1719	const mode = Io.File.default_mode \| S.IXUSR \| S.IXGRP \| S.IXOTH;
1720	try file.chmod(mode);	1720	try file.chmod(mode);
1721	}	1721	}
1722		1722
...	@@ -1738,10 +1738,10 @@ const HashedFile = struct {	...	@@ -1738,10 +1738,10 @@ const HashedFile = struct {
1738	size: u64,	1738	size: u64,
1739		1739
1740	const Error =	1740	const Error =
1741	fs.File.OpenError \|\|	1741	Io.File.OpenError \|\|
1742	fs.File.ReadError \|\|	1742	Io.File.ReadError \|\|
1743	fs.File.StatError \|\|	1743	Io.File.StatError \|\|
1744	fs.File.ChmodError \|\|	1744	Io.File.ChmodError \|\|
1745	Io.Dir.ReadLinkError;	1745	Io.Dir.ReadLinkError;
1746		1746
1747	const Kind = enum { file, link };	1747	const Kind = enum { file, link };

src/Package/Fetch/git.zig+11-11

...	@@ -198,8 +198,8 @@ pub const Repository = struct {	...	@@ -198,8 +198,8 @@ pub const Repository = struct {
198	repo: *Repository,	198	repo: *Repository,
199	allocator: Allocator,	199	allocator: Allocator,
200	format: Oid.Format,	200	format: Oid.Format,
201	pack_file: *std.fs.File.Reader,	201	pack_file: *Io.File.Reader,
202	index_file: *std.fs.File.Reader,	202	index_file: *Io.File.Reader,
203	) !void {	203	) !void {
204	repo.* = .{ .odb = undefined };	204	repo.* = .{ .odb = undefined };
205	try repo.odb.init(allocator, format, pack_file, index_file);	205	try repo.odb.init(allocator, format, pack_file, index_file);
...	@@ -372,9 +372,9 @@ pub const Repository = struct {	...	@@ -372,9 +372,9 @@ pub const Repository = struct {
372	/// [pack-format](https://git-scm.com/docs/pack-format).	372	/// [pack-format](https://git-scm.com/docs/pack-format).
373	const Odb = struct {	373	const Odb = struct {
374	format: Oid.Format,	374	format: Oid.Format,
375	pack_file: *std.fs.File.Reader,	375	pack_file: *Io.File.Reader,
376	index_header: IndexHeader,	376	index_header: IndexHeader,
377	index_file: *std.fs.File.Reader,	377	index_file: *Io.File.Reader,
378	cache: ObjectCache = .{},	378	cache: ObjectCache = .{},
379	allocator: Allocator,	379	allocator: Allocator,
380		380
...	@@ -383,8 +383,8 @@ const Odb = struct {	...	@@ -383,8 +383,8 @@ const Odb = struct {
383	odb: *Odb,	383	odb: *Odb,
384	allocator: Allocator,	384	allocator: Allocator,
385	format: Oid.Format,	385	format: Oid.Format,
386	pack_file: *std.fs.File.Reader,	386	pack_file: *Io.File.Reader,
387	index_file: *std.fs.File.Reader,	387	index_file: *Io.File.Reader,
388	) !void {	388	) !void {
389	try pack_file.seekTo(0);	389	try pack_file.seekTo(0);
390	try index_file.seekTo(0);	390	try index_file.seekTo(0);
...	@@ -1272,8 +1272,8 @@ const IndexEntry = struct {	...	@@ -1272,8 +1272,8 @@ const IndexEntry = struct {
1272	pub fn indexPack(	1272	pub fn indexPack(
1273	allocator: Allocator,	1273	allocator: Allocator,
1274	format: Oid.Format,	1274	format: Oid.Format,
1275	pack: *std.fs.File.Reader,	1275	pack: *Io.File.Reader,
1276	index_writer: *std.fs.File.Writer,	1276	index_writer: *Io.File.Writer,
1277	) !void {	1277	) !void {
1278	try pack.seekTo(0);	1278	try pack.seekTo(0);
1279		1279
...	@@ -1372,7 +1372,7 @@ pub fn indexPack(	...	@@ -1372,7 +1372,7 @@ pub fn indexPack(
1372	fn indexPackFirstPass(	1372	fn indexPackFirstPass(
1373	allocator: Allocator,	1373	allocator: Allocator,
1374	format: Oid.Format,	1374	format: Oid.Format,
1375	pack: *std.fs.File.Reader,	1375	pack: *Io.File.Reader,
1376	index_entries: *std.AutoHashMapUnmanaged(Oid, IndexEntry),	1376	index_entries: *std.AutoHashMapUnmanaged(Oid, IndexEntry),
1377	pending_deltas: *std.ArrayList(IndexEntry),	1377	pending_deltas: *std.ArrayList(IndexEntry),
1378	) !Oid {	1378	) !Oid {
...	@@ -1425,7 +1425,7 @@ fn indexPackFirstPass(	...	@@ -1425,7 +1425,7 @@ fn indexPackFirstPass(
1425	fn indexPackHashDelta(	1425	fn indexPackHashDelta(
1426	allocator: Allocator,	1426	allocator: Allocator,
1427	format: Oid.Format,	1427	format: Oid.Format,
1428	pack: *std.fs.File.Reader,	1428	pack: *Io.File.Reader,
1429	delta: IndexEntry,	1429	delta: IndexEntry,
1430	index_entries: std.AutoHashMapUnmanaged(Oid, IndexEntry),	1430	index_entries: std.AutoHashMapUnmanaged(Oid, IndexEntry),
1431	cache: *ObjectCache,	1431	cache: *ObjectCache,
...	@@ -1477,7 +1477,7 @@ fn indexPackHashDelta(	...	@@ -1477,7 +1477,7 @@ fn indexPackHashDelta(
1477	fn resolveDeltaChain(	1477	fn resolveDeltaChain(
1478	allocator: Allocator,	1478	allocator: Allocator,
1479	format: Oid.Format,	1479	format: Oid.Format,
1480	pack: *std.fs.File.Reader,	1480	pack: *Io.File.Reader,
1481	base_object: Object,	1481	base_object: Object,
1482	delta_offsets: []const u64,	1482	delta_offsets: []const u64,
1483	cache: *ObjectCache,	1483	cache: *ObjectCache,

src/Zcu.zig+4-4

src/Zcu/PerThread.zig+3-3

...	@@ -118,7 +118,7 @@ pub fn updateFile(	...	@@ -118,7 +118,7 @@ pub fn updateFile(
118	const zir_dir = cache_directory.handle;	118	const zir_dir = cache_directory.handle;
119		119
120	// Determine whether we need to reload the file from disk and redo parsing and AstGen.	120	// Determine whether we need to reload the file from disk and redo parsing and AstGen.
121	var lock: std.fs.File.Lock = switch (file.status) {	121	var lock: Io.File.Lock = switch (file.status) {
122	.never_loaded, .retryable_failure => lock: {	122	.never_loaded, .retryable_failure => lock: {
123	// First, load the cached ZIR code, if any.	123	// First, load the cached ZIR code, if any.
124	log.debug("AstGen checking cache: {f} (local={}, digest={s})", .{	124	log.debug("AstGen checking cache: {f} (local={}, digest={s})", .{
...	@@ -346,8 +346,8 @@ pub fn updateFile(	...	@@ -346,8 +346,8 @@ pub fn updateFile(
346		346
347	fn loadZirZoirCache(	347	fn loadZirZoirCache(
348	zcu: *Zcu,	348	zcu: *Zcu,
349	cache_file: std.fs.File,	349	cache_file: Io.File,
350	stat: std.fs.File.Stat,	350	stat: Io.File.Stat,
351	file: *Zcu.File,	351	file: *Zcu.File,
352	comptime mode: Ast.Mode,	352	comptime mode: Ast.Mode,
353	) !enum { success, invalid, truncated, stale } {	353	) !enum { success, invalid, truncated, stale } {

src/fmt.zig+8-8

...	@@ -37,9 +37,9 @@ const Fmt = struct {	...	@@ -37,9 +37,9 @@ const Fmt = struct {
37	arena: Allocator,	37	arena: Allocator,
38	io: Io,	38	io: Io,
39	out_buffer: std.Io.Writer.Allocating,	39	out_buffer: std.Io.Writer.Allocating,
40	stdout_writer: *fs.File.Writer,	40	stdout_writer: *Io.File.Writer,
41		41
42	const SeenMap = std.AutoHashMap(fs.File.INode, void);	42	const SeenMap = std.AutoHashMap(Io.File.INode, void);
43	};	43	};
44		44
45	pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !void {	45	pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !void {
...	@@ -59,7 +59,7 @@ pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !	...	@@ -59,7 +59,7 @@ pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !
59	const arg = args[i];	59	const arg = args[i];
60	if (mem.startsWith(u8, arg, "-")) {	60	if (mem.startsWith(u8, arg, "-")) {
61	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {	61	if (mem.eql(u8, arg, "-h") or mem.eql(u8, arg, "--help")) {
62	try fs.File.stdout().writeAll(usage_fmt);	62	try Io.File.stdout().writeAll(usage_fmt);
63	return process.cleanExit();	63	return process.cleanExit();
64	} else if (mem.eql(u8, arg, "--color")) {	64	} else if (mem.eql(u8, arg, "--color")) {
65	if (i + 1 >= args.len) {	65	if (i + 1 >= args.len) {
...	@@ -99,9 +99,9 @@ pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !	...	@@ -99,9 +99,9 @@ pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !
99	fatal("cannot use --stdin with positional arguments", .{});	99	fatal("cannot use --stdin with positional arguments", .{});
100	}	100	}
101		101
102	const stdin: fs.File = .stdin();	102	const stdin: Io.File = .stdin();
103	var stdio_buffer: [1024]u8 = undefined;	103	var stdio_buffer: [1024]u8 = undefined;
104	var file_reader: fs.File.Reader = stdin.reader(io, &stdio_buffer);	104	var file_reader: Io.File.Reader = stdin.reader(io, &stdio_buffer);
105	const source_code = std.zig.readSourceFileToEndAlloc(gpa, &file_reader) catch \|err\| {	105	const source_code = std.zig.readSourceFileToEndAlloc(gpa, &file_reader) catch \|err\| {
106	fatal("unable to read stdin: {}", .{err});	106	fatal("unable to read stdin: {}", .{err});
107	};	107	};
...	@@ -154,7 +154,7 @@ pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !	...	@@ -154,7 +154,7 @@ pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !
154	process.exit(code);	154	process.exit(code);
155	}	155	}
156		156
157	return fs.File.stdout().writeAll(formatted);	157	return Io.File.stdout().writeAll(formatted);
158	}	158	}
159		159
160	if (input_files.items.len == 0) {	160	if (input_files.items.len == 0) {
...	@@ -162,7 +162,7 @@ pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !	...	@@ -162,7 +162,7 @@ pub fn run(gpa: Allocator, arena: Allocator, io: Io, args: []const []const u8) !
162	}	162	}
163		163
164	var stdout_buffer: [4096]u8 = undefined;	164	var stdout_buffer: [4096]u8 = undefined;
165	var stdout_writer = fs.File.stdout().writer(&stdout_buffer);	165	var stdout_writer = Io.File.stdout().writer(&stdout_buffer);
166		166
167	var fmt: Fmt = .{	167	var fmt: Fmt = .{
168	.gpa = gpa,	168	.gpa = gpa,
...	@@ -272,7 +272,7 @@ fn fmtPathFile(	...	@@ -272,7 +272,7 @@ fn fmtPathFile(
272	return error.IsDir;	272	return error.IsDir;
273		273
274	var read_buffer: [1024]u8 = undefined;	274	var read_buffer: [1024]u8 = undefined;
275	var file_reader: fs.File.Reader = source_file.reader(io, &read_buffer);	275	var file_reader: Io.File.Reader = source_file.reader(io, &read_buffer);
276	file_reader.size = stat.size;	276	file_reader.size = stat.size;
277		277
278	const gpa = fmt.gpa;	278	const gpa = fmt.gpa;

src/link.zig+10-10

...	@@ -393,7 +393,7 @@ pub const File = struct {	...	@@ -393,7 +393,7 @@ pub const File = struct {
393	comp: *Compilation,	393	comp: *Compilation,
394	emit: Path,	394	emit: Path,
395		395
396	file: ?fs.File,	396	file: ?Io.File,
397	/// When using the LLVM backend, the emitted object is written to a file with this name. This	397	/// When using the LLVM backend, the emitted object is written to a file with this name. This
398	/// object file then becomes a normal link input to LLD or a self-hosted linker.	398	/// object file then becomes a normal link input to LLD or a self-hosted linker.
399	///	399	///
...	@@ -1110,7 +1110,7 @@ pub const File = struct {	...	@@ -1110,7 +1110,7 @@ pub const File = struct {
1110	};	1110	};
1111	}	1111	}
1112		1112
1113	fn loadGnuLdScript(base: *File, path: Path, parent_query: UnresolvedInput.Query, file: fs.File) anyerror!void {	1113	fn loadGnuLdScript(base: *File, path: Path, parent_query: UnresolvedInput.Query, file: Io.File) anyerror!void {
1114	const comp = base.comp;	1114	const comp = base.comp;
1115	const diags = &comp.link_diags;	1115	const diags = &comp.link_diags;
1116	const gpa = comp.gpa;	1116	const gpa = comp.gpa;
...	@@ -1238,7 +1238,7 @@ pub const File = struct {	...	@@ -1238,7 +1238,7 @@ pub const File = struct {
1238	pub fn determineMode(	1238	pub fn determineMode(
1239	output_mode: std.builtin.OutputMode,	1239	output_mode: std.builtin.OutputMode,
1240	link_mode: std.builtin.LinkMode,	1240	link_mode: std.builtin.LinkMode,
1241	) fs.File.Mode {	1241	) Io.File.Mode {
1242	// On common systems with a 0o022 umask, 0o777 will still result in a file created	1242	// On common systems with a 0o022 umask, 0o777 will still result in a file created
1243	// with 0o755 permissions, but it works appropriately if the system is configured	1243	// with 0o755 permissions, but it works appropriately if the system is configured
1244	// more leniently. As another data point, C's fopen seems to open files with the	1244	// more leniently. As another data point, C's fopen seems to open files with the
...	@@ -1247,10 +1247,10 @@ pub const File = struct {	...	@@ -1247,10 +1247,10 @@ pub const File = struct {
1247	switch (output_mode) {	1247	switch (output_mode) {
1248	.Lib => return switch (link_mode) {	1248	.Lib => return switch (link_mode) {
1249	.dynamic => executable_mode,	1249	.dynamic => executable_mode,
1250	.static => fs.File.default_mode,	1250	.static => Io.File.default_mode,
1251	},	1251	},
1252	.Exe => return executable_mode,	1252	.Exe => return executable_mode,
1253	.Obj => return fs.File.default_mode,	1253	.Obj => return Io.File.default_mode,
1254	}	1254	}
1255	}	1255	}
1256		1256
...	@@ -1660,19 +1660,19 @@ pub const Input = union(enum) {	...	@@ -1660,19 +1660,19 @@ pub const Input = union(enum) {
1660		1660
1661	pub const Object = struct {	1661	pub const Object = struct {
1662	path: Path,	1662	path: Path,
1663	file: fs.File,	1663	file: Io.File,
1664	must_link: bool,	1664	must_link: bool,
1665	hidden: bool,	1665	hidden: bool,
1666	};	1666	};
1667		1667
1668	pub const Res = struct {	1668	pub const Res = struct {
1669	path: Path,	1669	path: Path,
1670	file: fs.File,	1670	file: Io.File,
1671	};	1671	};
1672		1672
1673	pub const Dso = struct {	1673	pub const Dso = struct {
1674	path: Path,	1674	path: Path,
1675	file: fs.File,	1675	file: Io.File,
1676	needed: bool,	1676	needed: bool,
1677	weak: bool,	1677	weak: bool,
1678	reexport: bool,	1678	reexport: bool,
...	@@ -1694,7 +1694,7 @@ pub const Input = union(enum) {	...	@@ -1694,7 +1694,7 @@ pub const Input = union(enum) {
1694	}	1694	}
1695		1695
1696	/// Returns `null` in the case of `dso_exact`.	1696	/// Returns `null` in the case of `dso_exact`.
1697	pub fn pathAndFile(input: Input) ?struct { Path, fs.File } {	1697	pub fn pathAndFile(input: Input) ?struct { Path, Io.File } {
1698	return switch (input) {	1698	return switch (input) {
1699	.object, .archive => \|obj\| .{ obj.path, obj.file },	1699	.object, .archive => \|obj\| .{ obj.path, obj.file },
1700	inline .res, .dso => \|x\| .{ x.path, x.file },	1700	inline .res, .dso => \|x\| .{ x.path, x.file },
...	@@ -2075,7 +2075,7 @@ fn resolveLibInput(	...	@@ -2075,7 +2075,7 @@ fn resolveLibInput(
2075	fn finishResolveLibInput(	2075	fn finishResolveLibInput(
2076	resolved_inputs: *std.ArrayList(Input),	2076	resolved_inputs: *std.ArrayList(Input),
2077	path: Path,	2077	path: Path,
2078	file: std.fs.File,	2078	file: Io.File,
2079	link_mode: std.builtin.LinkMode,	2079	link_mode: std.builtin.LinkMode,
2080	query: UnresolvedInput.Query,	2080	query: UnresolvedInput.Query,
2081	) ResolveLibInputResult {	2081	) ResolveLibInputResult {

src/link/Dwarf.zig+28-25

 @@ -1,3 +1,24 @@
+const Dwarf = @This();
+const std = @import("std");
+const Io = std.Io;
+const Allocator = std.mem.Allocator;
+const DW = std.dwarf;
+const Zir = std.zig.Zir;
+const assert = std.debug.assert;
+const log = std.log.scoped(.dwarf);
+const Writer = std.Io.Writer;
+const InternPool = @import("../InternPool.zig");
+const Module = @import("../Package.zig").Module;
+const Type = @import("../Type.zig");
+const Value = @import("../Value.zig");
+const Zcu = @import("../Zcu.zig");
+const codegen = @import("../codegen.zig");
+const dev = @import("../dev.zig");
+const link = @import("../link.zig");
+const target_info = @import("../target.zig");
 gpa: Allocator,
 bin_file: *link.File,
 format: DW.Format,
 @@ -29,16 +50,16 @@ pub const UpdateError = error{
     UnexpectedEndOfFile,
 } ||
     codegen.GenerateSymbolError ||
-    std.fs.File.OpenError ||
+    Io.File.OpenError ||
-    std.fs.File.SetEndPosError ||
+    Io.File.SetEndPosError ||
-    std.fs.File.CopyRangeError ||
+    Io.File.CopyRangeError ||
-    std.fs.File.PReadError ||
+    Io.File.PReadError ||
-    std.fs.File.PWriteError;
+    Io.File.PWriteError;
 pub const FlushError = UpdateError;
 pub const RelocError =
-    std.fs.File.PWriteError;
+    Io.File.PWriteError;
 pub const AddressSize = enum(u8) {
     @"32" = 4,
 @@ -6350,7 +6371,7 @@ const AbbrevCode = enum {
     });
 };
-fn getFile(dwarf: *Dwarf) ?std.fs.File {
+fn getFile(dwarf: *Dwarf) ?Io.File {
     if (dwarf.bin_file.cast(.macho)) |macho_file| if (macho_file.d_sym) |*d_sym| return d_sym.file;
     return dwarf.bin_file.file;
 }
 @@ -6429,21 +6450,3 @@ const force_incremental = false;
 inline fn incremental(dwarf: Dwarf) bool {
     return force_incremental or dwarf.bin_file.comp.config.incremental;
 }
-const Allocator = std.mem.Allocator;
-const DW = std.dwarf;
-const Dwarf = @This();
-const InternPool = @import("../InternPool.zig");
-const Module = @import("../Package.zig").Module;
-const Type = @import("../Type.zig");
-const Value = @import("../Value.zig");
-const Zcu = @import("../Zcu.zig");
-const Zir = std.zig.Zir;
-const assert = std.debug.assert;
-const codegen = @import("../codegen.zig");
-const dev = @import("../dev.zig");
-const link = @import("../link.zig");
-const log = std.log.scoped(.dwarf);
-const std = @import("std");
-const target_info = @import("../target.zig");
-const Writer = std.Io.Writer;

src/link/Elf.zig+3-2

src/link/Elf/Object.zig+33-32

 @@ -1,3 +1,30 @@
+const Object = @This();
+const std = @import("std");
+const Io = std.Io;
+const assert = std.debug.assert;
+const eh_frame = @import("eh_frame.zig");
+const elf = std.elf;
+const fs = std.fs;
+const log = std.log.scoped(.link);
+const math = std.math;
+const mem = std.mem;
+const Path = std.Build.Cache.Path;
+const Allocator = std.mem.Allocator;
+const Diags = @import("../../link.zig").Diags;
+const Archive = @import("Archive.zig");
+const Atom = @import("Atom.zig");
+const AtomList = @import("AtomList.zig");
+const Cie = eh_frame.Cie;
+const Elf = @import("../Elf.zig");
+const Fde = eh_frame.Fde;
+const File = @import("file.zig").File;
+const Merge = @import("Merge.zig");
+const Symbol = @import("Symbol.zig");
+const Alignment = Atom.Alignment;
+const riscv = @import("../riscv.zig");
 archive: ?InArchive = null,
 /// Archive files cannot contain subdirectories, so only the basename is needed
 /// for output. However, the full path is kept for error reporting.
 @@ -68,7 +95,7 @@ pub fn parse(
     diags: *Diags,
     /// For error reporting purposes only.
     path: Path,
-    handle: fs.File,
+    handle: Io.File,
     target: *const std.Target,
     debug_fmt_strip: bool,
     default_sym_version: elf.Versym,
 @@ -97,7 +124,7 @@ pub fn parseCommon(
     gpa: Allocator,
     diags: *Diags,
     path: Path,
-    handle: fs.File,
+    handle: Io.File,
     target: *const std.Target,
 ) !void {
     const offset = if (self.archive) |ar| ar.offset else 0;
 @@ -264,7 +291,7 @@ fn initAtoms(
     gpa: Allocator,
     diags: *Diags,
     path: Path,
-    handle: fs.File,
+    handle: Io.File,
     debug_fmt_strip: bool,
     target: *const std.Target,
 ) !void {
 @@ -421,7 +448,7 @@ fn initSymbols(
 fn parseEhFrame(
     self: *Object,
     gpa: Allocator,
-    handle: fs.File,
+    handle: Io.File,
     shndx: u32,
     target: *const std.Target,
 ) !void {
 @@ -1310,7 +1337,7 @@ fn addString(self: *Object, gpa: Allocator, str: []const u8) !u32 {
 }
 /// Caller owns the memory.
-fn preadShdrContentsAlloc(self: Object, gpa: Allocator, handle: fs.File, index: u32) ![]u8 {
+fn preadShdrContentsAlloc(self: Object, gpa: Allocator, handle: Io.File, index: u32) ![]u8 {
     assert(index < self.shdrs.items.len);
     const offset = if (self.archive) |ar| ar.offset else 0;
     const shdr = self.shdrs.items[index];
 @@ -1320,7 +1347,7 @@ fn preadShdrContentsAlloc(self: Object, gpa: Allocator, handle: fs.File, index:
 }
 /// Caller owns the memory.
-fn preadRelocsAlloc(self: Object, gpa: Allocator, handle: fs.File, shndx: u32) ![]align(1) const elf.Elf64_Rela {
+fn preadRelocsAlloc(self: Object, gpa: Allocator, handle: Io.File, shndx: u32) ![]align(1) const elf.Elf64_Rela {
     const raw = try self.preadShdrContentsAlloc(gpa, handle, shndx);
     const num = @divExact(raw.len, @sizeOf(elf.Elf64_Rela));
     return @as([*]align(1) const elf.Elf64_Rela, @ptrCast(raw.ptr))[0..num];
 @@ -1552,29 +1579,3 @@ const InArchive = struct {
     offset: u64,
     size: u32,
 };
-const Object = @This();
-const std = @import("std");
-const assert = std.debug.assert;
-const eh_frame = @import("eh_frame.zig");
-const elf = std.elf;
-const fs = std.fs;
-const log = std.log.scoped(.link);
-const math = std.math;
-const mem = std.mem;
-const Path = std.Build.Cache.Path;
-const Allocator = std.mem.Allocator;
-const Diags = @import("../../link.zig").Diags;
-const Archive = @import("Archive.zig");
-const Atom = @import("Atom.zig");
-const AtomList = @import("AtomList.zig");
-const Cie = eh_frame.Cie;
-const Elf = @import("../Elf.zig");
-const Fde = eh_frame.Fde;
-const File = @import("file.zig").File;
-const Merge = @import("Merge.zig");
-const Symbol = @import("Symbol.zig");
-const Alignment = Atom.Alignment;
-const riscv = @import("../riscv.zig");

src/link/Elf/SharedObject.zig+19-18

 @@ -1,3 +1,20 @@
+const SharedObject = @This();
+const std = @import("std");
+const Io = std.Io;
+const assert = std.debug.assert;
+const elf = std.elf;
+const log = std.log.scoped(.elf);
+const mem = std.mem;
+const Path = std.Build.Cache.Path;
+const Stat = std.Build.Cache.File.Stat;
+const Allocator = mem.Allocator;
+const Elf = @import("../Elf.zig");
+const File = @import("file.zig").File;
+const Symbol = @import("Symbol.zig");
+const Diags = @import("../../link.zig").Diags;
 path: Path,
 index: File.Index,
 @@ -94,7 +111,7 @@ pub fn parseHeader(
     gpa: Allocator,
     diags: *Diags,
     file_path: Path,
-    fs_file: std.fs.File,
+    fs_file: Io.File,
     stat: Stat,
     target: *const std.Target,
 ) !Header {
 @@ -192,7 +209,7 @@ pub fn parse(
     gpa: Allocator,
     /// Moves resources from header. Caller may unconditionally deinit.
     header: *Header,
-    fs_file: std.fs.File,
+    fs_file: Io.File,
 ) !Parsed {
     const symtab = if (header.dynsym_sect_index) |index| st: {
         const shdr = header.sections[index];
 @@ -534,19 +551,3 @@ const Format = struct {
         }
     }
 };
-const SharedObject = @This();
-const std = @import("std");
-const assert = std.debug.assert;
-const elf = std.elf;
-const log = std.log.scoped(.elf);
-const mem = std.mem;
-const Path = std.Build.Cache.Path;
-const Stat = std.Build.Cache.File.Stat;
-const Allocator = mem.Allocator;
-const Elf = @import("../Elf.zig");
-const File = @import("file.zig").File;
-const Symbol = @import("Symbol.zig");
-const Diags = @import("../../link.zig").Diags;

src/link/Elf/file.zig+18-17

 @@ -1,3 +1,20 @@
+const std = @import("std");
+const Io = std.Io;
+const elf = std.elf;
+const log = std.log.scoped(.link);
+const Path = std.Build.Cache.Path;
+const Allocator = std.mem.Allocator;
+const Archive = @import("Archive.zig");
+const Atom = @import("Atom.zig");
+const Cie = @import("eh_frame.zig").Cie;
+const Elf = @import("../Elf.zig");
+const LinkerDefined = @import("LinkerDefined.zig");
+const Object = @import("Object.zig");
+const SharedObject = @import("SharedObject.zig");
+const Symbol = @import("Symbol.zig");
+const ZigObject = @import("ZigObject.zig");
 pub const File = union(enum) {
     zig_object: *ZigObject,
     linker_defined: *LinkerDefined,
 @@ -279,22 +296,6 @@ pub const File = union(enum) {
         shared_object: SharedObject,
     };
-    pub const Handle = std.fs.File;
+    pub const Handle = Io.File;
     pub const HandleIndex = Index;
 };
-const std = @import("std");
-const elf = std.elf;
-const log = std.log.scoped(.link);
-const Path = std.Build.Cache.Path;
-const Allocator = std.mem.Allocator;
-const Archive = @import("Archive.zig");
-const Atom = @import("Atom.zig");
-const Cie = @import("eh_frame.zig").Cie;
-const Elf = @import("../Elf.zig");
-const LinkerDefined = @import("LinkerDefined.zig");
-const Object = @import("Object.zig");
-const SharedObject = @import("SharedObject.zig");
-const Symbol = @import("Symbol.zig");
-const ZigObject = @import("ZigObject.zig");

src/link/Elf2.zig+25-21

 @@ -1,3 +1,23 @@
+const Elf = @This();
+const builtin = @import("builtin");
+const native_endian = builtin.cpu.arch.endian();
+const std = @import("std");
+const Io = std.Io;
+const assert = std.debug.assert;
+const log = std.log.scoped(.link);
+const codegen = @import("../codegen.zig");
+const Compilation = @import("../Compilation.zig");
+const InternPool = @import("../InternPool.zig");
+const link = @import("../link.zig");
+const MappedFile = @import("MappedFile.zig");
+const target_util = @import("../target.zig");
+const Type = @import("../Type.zig");
+const Value = @import("../Value.zig");
+const Zcu = @import("../Zcu.zig");
 base: link.File,
 options: link.File.OpenOptions,
 mf: MappedFile,
 @@ -1973,8 +1993,8 @@ pub fn lazySymbol(elf: *Elf, lazy: link.File.LazySymbol) !Symbol.Index {
     return lazy_gop.value_ptr.*;
 }
-pub fn loadInput(elf: *Elf, input: link.Input) (std.fs.File.Reader.SizeError ||
+pub fn loadInput(elf: *Elf, input: link.Input) (Io.File.Reader.SizeError ||
-    std.Io.File.Reader.Error || MappedFile.Error || error{ EndOfStream, BadMagic, LinkFailure })!void {
+    Io.File.Reader.Error || MappedFile.Error || error{ EndOfStream, BadMagic, LinkFailure })!void {
     const io = elf.base.comp.io;
     var buf: [4096]u8 = undefined;
     switch (input) {
 @@ -2007,7 +2027,7 @@ pub fn loadInput(elf: *Elf, input: link.Input) (std.fs.File.Reader.SizeError ||
         .dso_exact => |dso_exact| try elf.loadDsoExact(dso_exact.name),
     }
 }
-fn loadArchive(elf: *Elf, path: std.Build.Cache.Path, fr: *std.Io.File.Reader) !void {
+fn loadArchive(elf: *Elf, path: std.Build.Cache.Path, fr: *Io.File.Reader) !void {
     const comp = elf.base.comp;
     const gpa = comp.gpa;
     const diags = &comp.link_diags;
 @@ -2067,7 +2087,7 @@ fn loadObject(
     elf: *Elf,
     path: std.Build.Cache.Path,
     member: ?[]const u8,
-    fr: *std.Io.File.Reader,
+    fr: *Io.File.Reader,
     fl: MappedFile.Node.FileLocation,
 ) !void {
     const comp = elf.base.comp;
 @@ -2310,7 +2330,7 @@ fn loadObject(
         },
     }
 }
-fn loadDso(elf: *Elf, path: std.Build.Cache.Path, fr: *std.Io.File.Reader) !void {
+fn loadDso(elf: *Elf, path: std.Build.Cache.Path, fr: *Io.File.Reader) !void {
     const comp = elf.base.comp;
     const diags = &comp.link_diags;
     const r = &fr.interface;
 @@ -3822,19 +3842,3 @@ pub fn printNode(
         try w.writeByte('\n');
     }
 }
-const assert = std.debug.assert;
-const builtin = @import("builtin");
-const codegen = @import("../codegen.zig");
-const Compilation = @import("../Compilation.zig");
-const Elf = @This();
-const InternPool = @import("../InternPool.zig");
-const link = @import("../link.zig");
-const log = std.log.scoped(.link);
-const MappedFile = @import("MappedFile.zig");
-const native_endian = builtin.cpu.arch.endian();
-const std = @import("std");
-const target_util = @import("../target.zig");
-const Type = @import("../Type.zig");
-const Value = @import("../Value.zig");
-const Zcu = @import("../Zcu.zig");

src/link/MachO.zig+12-11

 @@ -890,7 +890,7 @@ pub fn classifyInputFile(self: *MachO, input: link.Input) !void {
     _ = try self.addTbd(.fromLinkInput(input), true, fh);
 }
-fn parseFatFile(self: *MachO, file: std.fs.File, path: Path) !?fat.Arch {
+fn parseFatFile(self: *MachO, file: Io.File, path: Path) !?fat.Arch {
     const diags = &self.base.comp.link_diags;
     const fat_h = fat.readFatHeader(file) catch return null;
     if (fat_h.magic != macho.FAT_MAGIC and fat_h.magic != macho.FAT_MAGIC_64) return null;
 @@ -903,7 +903,7 @@ fn parseFatFile(self: *MachO, file: std.fs.File, path: Path) !?fat.Arch {
     return diags.failParse(path, "missing arch in universal file: expected {s}", .{@tagName(cpu_arch)});
 }
-pub fn readMachHeader(file: std.fs.File, offset: usize) !macho.mach_header_64 {
+pub fn readMachHeader(file: Io.File, offset: usize) !macho.mach_header_64 {
     var buffer: [@sizeOf(macho.mach_header_64)]u8 = undefined;
     const nread = try file.preadAll(&buffer, offset);
     if (nread != buffer.len) return error.InputOutput;
 @@ -911,7 +911,7 @@ pub fn readMachHeader(file: std.fs.File, offset: usize) !macho.mach_header_64 {
     return hdr;
 }
-pub fn readArMagic(file: std.fs.File, offset: usize, buffer: *[Archive.SARMAG]u8) ![]const u8 {
+pub fn readArMagic(file: Io.File, offset: usize, buffer: *[Archive.SARMAG]u8) ![]const u8 {
     const nread = try file.preadAll(buffer, offset);
     if (nread != buffer.len) return error.InputOutput;
     return buffer[0..Archive.SARMAG];
 @@ -3768,7 +3768,7 @@ pub fn getInternalObject(self: *MachO) ?*InternalObject {
     return self.getFile(index).?.internal;
 }
-pub fn addFileHandle(self: *MachO, file: fs.File) !File.HandleIndex {
+pub fn addFileHandle(self: *MachO, file: Io.File) !File.HandleIndex {
     const gpa = self.base.comp.gpa;
     const index: File.HandleIndex = @intCast(self.file_handles.items.len);
     const fh = try self.file_handles.addOne(gpa);
 @@ -5373,10 +5373,11 @@ const max_distance = (1 << (jump_bits - 1));
 const max_allowed_distance = max_distance - 0x500_000;
 const MachO = @This();
-const std = @import("std");
 const build_options = @import("build_options");
 const builtin = @import("builtin");
+const std = @import("std");
+const Io = std.Io;
 const assert = std.debug.assert;
 const fs = std.fs;
 const log = std.log.scoped(.link);
 @@ -5386,6 +5387,11 @@ const math = std.math;
 const mem = std.mem;
 const meta = std.meta;
 const Writer = std.Io.Writer;
+const AtomicBool = std.atomic.Value(bool);
+const Cache = std.Build.Cache;
+const Hash = std.hash.Wyhash;
+const Md5 = std.crypto.hash.Md5;
+const Allocator = std.mem.Allocator;
 const aarch64 = codegen.aarch64.encoding;
 const bind = @import("MachO/dyld_info/bind.zig");
 @@ -5403,11 +5409,8 @@ const trace = @import("../tracy.zig").trace;
 const synthetic = @import("MachO/synthetic.zig");
 const Alignment = Atom.Alignment;
-const Allocator = mem.Allocator;
 const Archive = @import("MachO/Archive.zig");
-const AtomicBool = std.atomic.Value(bool);
 const Bind = bind.Bind;
-const Cache = std.Build.Cache;
 const CodeSignature = @import("MachO/CodeSignature.zig");
 const Compilation = @import("../Compilation.zig");
 const DataInCode = synthetic.DataInCode;
 @@ -5417,14 +5420,12 @@ const ExportTrie = @import("MachO/dyld_info/Trie.zig");
 const Path = Cache.Path;
 const File = @import("MachO/file.zig").File;
 const GotSection = synthetic.GotSection;
-const Hash = std.hash.Wyhash;
 const Indsymtab = synthetic.Indsymtab;
 const InternalObject = @import("MachO/InternalObject.zig");
 const ObjcStubsSection = synthetic.ObjcStubsSection;
 const Object = @import("MachO/Object.zig");
 const LazyBind = bind.LazyBind;
 const LaSymbolPtrSection = synthetic.LaSymbolPtrSection;
-const Md5 = std.crypto.hash.Md5;
 const Zcu = @import("../Zcu.zig");
 const InternPool = @import("../InternPool.zig");
 const Rebase = @import("MachO/dyld_info/Rebase.zig");

src/link/MachO/CodeSignature.zig+5-3

 @@ -1,17 +1,19 @@
 const CodeSignature = @This();
 const std = @import("std");
+const Io = std.Io;
 const assert = std.debug.assert;
 const fs = std.fs;
 const log = std.log.scoped(.link);
 const macho = std.macho;
 const mem = std.mem;
 const testing = std.testing;
+const Sha256 = std.crypto.hash.sha2.Sha256;
+const Allocator = std.mem.Allocator;
 const trace = @import("../../tracy.zig").trace;
-const Allocator = mem.Allocator;
 const Hasher = @import("hasher.zig").ParallelHasher;
 const MachO = @import("../MachO.zig");
-const Sha256 = std.crypto.hash.sha2.Sha256;
 const hash_size = Sha256.digest_length;
 @@ -250,7 +252,7 @@ pub fn addEntitlements(self: *CodeSignature, allocator: Allocator, path: []const
 }
 pub const WriteOpts = struct {
-    file: fs.File,
+    file: Io.File,
     exec_seg_base: u64,
     exec_seg_limit: u64,
     file_size: u32,

src/link/MachO/fat.zig+7-5

 @@ -1,18 +1,20 @@
+const builtin = @import("builtin");
+const native_endian = builtin.target.cpu.arch.endian();
 const std = @import("std");
+const Io = std.Io;
 const assert = std.debug.assert;
-const builtin = @import("builtin");
 const log = std.log.scoped(.macho);
 const macho = std.macho;
 const mem = std.mem;
-const native_endian = builtin.target.cpu.arch.endian();
 const MachO = @import("../MachO.zig");
-pub fn readFatHeader(file: std.fs.File) !macho.fat_header {
+pub fn readFatHeader(file: Io.File) !macho.fat_header {
     return readFatHeaderGeneric(macho.fat_header, file, 0);
 }
-fn readFatHeaderGeneric(comptime Hdr: type, file: std.fs.File, offset: usize) !Hdr {
+fn readFatHeaderGeneric(comptime Hdr: type, file: Io.File, offset: usize) !Hdr {
     var buffer: [@sizeOf(Hdr)]u8 = undefined;
     const nread = try file.preadAll(&buffer, offset);
     if (nread != buffer.len) return error.InputOutput;
 @@ -27,7 +29,7 @@ pub const Arch = struct {
     size: u32,
 };
-pub fn parseArchs(file: std.fs.File, fat_header: macho.fat_header, out: *[2]Arch) ![]const Arch {
+pub fn parseArchs(file: Io.File, fat_header: macho.fat_header, out: *[2]Arch) ![]const Arch {
     var count: usize = 0;
     var fat_arch_index: u32 = 0;
     while (fat_arch_index < fat_header.nfat_arch and count < out.len) : (fat_arch_index += 1) {

src/link/MachO/file.zig+2-1

 @@ -355,11 +355,12 @@ pub const File = union(enum) {
         dylib: Dylib,
     };
-    pub const Handle = std.fs.File;
+    pub const Handle = Io.File;
     pub const HandleIndex = Index;
 };
 const std = @import("std");
+const Io = std.Io;
 const assert = std.debug.assert;
 const log = std.log.scoped(.link);
 const macho = std.macho;

src/link/MachO/hasher.zig+10-12

 @@ -1,3 +1,9 @@
+const std = @import("std");
+const Io = std.Io;
+const Allocator = std.mem.Allocator;
+const trace = @import("../../tracy.zig").trace;
 pub fn ParallelHasher(comptime Hasher: type) type {
     const hash_size = Hasher.digest_length;
 @@ -5,7 +11,7 @@ pub fn ParallelHasher(comptime Hasher: type) type {
         allocator: Allocator,
         io: std.Io,
-        pub fn hash(self: Self, file: fs.File, out: [][hash_size]u8, opts: struct {
+        pub fn hash(self: Self, file: Io.File, out: [][hash_size]u8, opts: struct {
             chunk_size: u64 = 0x4000,
             max_file_size: ?u64 = null,
         }) !void {
 @@ -23,7 +29,7 @@ pub fn ParallelHasher(comptime Hasher: type) type {
             const buffer = try self.allocator.alloc(u8, chunk_size * out.len);
             defer self.allocator.free(buffer);
-            const results = try self.allocator.alloc(fs.File.PReadError!usize, out.len);
+            const results = try self.allocator.alloc(Io.File.PReadError!usize, out.len);
             defer self.allocator.free(results);
             {
 @@ -51,11 +57,11 @@ pub fn ParallelHasher(comptime Hasher: type) type {
         }
         fn worker(
-            file: fs.File,
+            file: Io.File,
             fstart: usize,
             buffer: []u8,
             out: *[hash_size]u8,
-            err: *fs.File.PReadError!usize,
+            err: *Io.File.PReadError!usize,
         ) void {
             const tracy = trace(@src());
             defer tracy.end();
 @@ -66,11 +72,3 @@ pub fn ParallelHasher(comptime Hasher: type) type {
         const Self = @This();
     };
 }
-const assert = std.debug.assert;
-const fs = std.fs;
-const mem = std.mem;
-const std = @import("std");
-const trace = @import("../../tracy.zig").trace;
-const Allocator = mem.Allocator;

src/link/MachO/uuid.zig+9-10

 @@ -1,10 +1,18 @@
+const std = @import("std");
+const Io = std.Io;
+const Md5 = std.crypto.hash.Md5;
+const trace = @import("../../tracy.zig").trace;
+const Compilation = @import("../../Compilation.zig");
+const Hasher = @import("hasher.zig").ParallelHasher;
 /// Calculates Md5 hash of each chunk in parallel and then hashes all Md5 hashes to produce
 /// the final digest.
 /// While this is NOT a correct MD5 hash of the contents, this methodology is used by LLVM/LLD
 /// and we will use it too as it seems accepted by Apple OSes.
 /// TODO LLD also hashes the output filename to disambiguate between same builds with different
 /// output files. Should we also do that?
-pub fn calcUuid(comp: *const Compilation, file: fs.File, file_size: u64, out: *[Md5.digest_length]u8) !void {
+pub fn calcUuid(comp: *const Compilation, file: Io.File, file_size: u64, out: *[Md5.digest_length]u8) !void {
     const tracy = trace(@src());
     defer tracy.end();
 @@ -37,12 +45,3 @@ inline fn conform(out: *[Md5.digest_length]u8) void {
     out[6] = (out[6] & 0x0F) | (3 << 4);
     out[8] = (out[8] & 0x3F) | 0x80;
 }
-const fs = std.fs;
-const mem = std.mem;
-const std = @import("std");
-const trace = @import("../../tracy.zig").trace;
-const Compilation = @import("../../Compilation.zig");
-const Md5 = std.crypto.hash.Md5;
-const Hasher = @import("hasher.zig").ParallelHasher;

src/link/MappedFile.zig+14-11

 @@ -1,3 +1,15 @@
+const MappedFile = @This();
+const builtin = @import("builtin");
+const is_linux = builtin.os.tag == .linux;
+const is_windows = builtin.os.tag == .windows;
+const std = @import("std");
+const Io = std.Io;
+const assert = std.debug.assert;
+const linux = std.os.linux;
+const windows = std.os.windows;
 file: std.Io.File,
 flags: packed struct {
     block_size: std.mem.Alignment,
 @@ -16,7 +28,7 @@ writers: std.SinglyLinkedList,
 pub const growth_factor = 4;
-pub const Error = std.posix.MMapError || std.posix.MRemapError || std.fs.File.SetEndPosError || error{
+pub const Error = std.posix.MMapError || std.posix.MRemapError || Io.File.SetEndPosError || error{
     NotFile,
     SystemResources,
     IsDir,
 @@ -618,7 +630,7 @@ fn resizeNode(mf: *MappedFile, gpa: std.mem.Allocator, ni: Node.Index, requested
     // Resize the entire file
     if (ni == Node.Index.root) {
         try mf.ensureCapacityForSetLocation(gpa);
-        try std.fs.File.adaptFromNewApi(mf.file).setEndPos(new_size);
+        try Io.File.adaptFromNewApi(mf.file).setEndPos(new_size);
         try mf.ensureTotalCapacity(@intCast(new_size));
         ni.setLocationAssumeCapacity(mf, old_offset, new_size);
         return;
 @@ -1059,12 +1071,3 @@ fn verifyNode(mf: *MappedFile, parent_ni: Node.Index) void {
         ni = node.next;
     }
 }
-const assert = std.debug.assert;
-const builtin = @import("builtin");
-const is_linux = builtin.os.tag == .linux;
-const is_windows = builtin.os.tag == .windows;
-const linux = std.os.linux;
-const MappedFile = @This();
-const std = @import("std");
-const windows = std.os.windows;

src/link/Wasm.zig+3-2

...	@@ -20,6 +20,7 @@ const native_endian = builtin.cpu.arch.endian();	...	@@ -20,6 +20,7 @@ const native_endian = builtin.cpu.arch.endian();
20	const build_options = @import("build_options");	20	const build_options = @import("build_options");
21		21
22	const std = @import("std");	22	const std = @import("std");
		23	const Io = std.Io;
23	const Allocator = std.mem.Allocator;	24	const Allocator = std.mem.Allocator;
24	const Cache = std.Build.Cache;	25	const Cache = std.Build.Cache;
25	const Path = Cache.Path;	26	const Path = Cache.Path;
...	@@ -3001,9 +3002,9 @@ pub fn createEmpty(	...	@@ -3001,9 +3002,9 @@ pub fn createEmpty(
3001	.read = true,	3002	.read = true,
3002	.mode = if (fs.has_executable_bit)	3003	.mode = if (fs.has_executable_bit)
3003	if (target.os.tag == .wasi and output_mode == .Exe)	3004	if (target.os.tag == .wasi and output_mode == .Exe)
3004	fs.File.default_mode \| 0b001_000_000	3005	Io.File.default_mode \| 0b001_000_000
3005	else	3006	else
3006	fs.File.default_mode	3007	Io.File.default_mode
3007	else	3008	else
3008	0,	3009	0,
3009	});	3010	});

src/link/tapi.zig+5-5

...	@@ -1,10 +1,10 @@	...	@@ -1,10 +1,10 @@
1	const std = @import("std");	1	const std = @import("std");
2	const fs = std.fs;	2	const Io = std.Io;
3	const mem = std.mem;	3	const mem = std.mem;
4	const log = std.log.scoped(.tapi);	4	const log = std.log.scoped(.tapi);
5	const yaml = @import("tapi/yaml.zig");	5	const Allocator = std.mem.Allocator;
6		6
7	const Allocator = mem.Allocator;	7	const yaml = @import("tapi/yaml.zig");
8	const Yaml = yaml.Yaml;	8	const Yaml = yaml.Yaml;
9		9
10	const VersionField = union(enum) {	10	const VersionField = union(enum) {
...	@@ -130,7 +130,7 @@ pub const Tbd = union(enum) {	...	@@ -130,7 +130,7 @@ pub const Tbd = union(enum) {
130	pub const TapiError = error{	130	pub const TapiError = error{
131	NotLibStub,	131	NotLibStub,
132	InputOutput,	132	InputOutput,
133	} \|\| yaml.YamlError \|\| std.fs.File.PReadError;	133	} \|\| yaml.YamlError \|\| Io.File.PReadError;
134		134
135	pub const LibStub = struct {	135	pub const LibStub = struct {
136	/// Underlying memory for stub's contents.	136	/// Underlying memory for stub's contents.
...	@@ -139,7 +139,7 @@ pub const LibStub = struct {	...	@@ -139,7 +139,7 @@ pub const LibStub = struct {
139	/// Typed contents of the tbd file.	139	/// Typed contents of the tbd file.
140	inner: []Tbd,	140	inner: []Tbd,
141		141
142	pub fn loadFromFile(allocator: Allocator, file: fs.File) TapiError!LibStub {	142	pub fn loadFromFile(allocator: Allocator, file: Io.File) TapiError!LibStub {
143	const filesize = blk: {	143	const filesize = blk: {
144	const stat = file.stat() catch break :blk std.math.maxInt(u32);	144	const stat = file.stat() catch break :blk std.math.maxInt(u32);
145	break :blk @min(stat.size, std.math.maxInt(u32));	145	break :blk @min(stat.size, std.math.maxInt(u32));

author	Andrew Kelley <andrew@ziglang.org> 2025-12-06 17:23:07-08:00
committer	Andrew Kelley <andrew@ziglang.org> 2025-12-23 22:15:07-08:00
log	3204fb756980c19b7a95534acdd7a1bba837fbc3
tree	45b5525ead2923de83ea85eacca351da64d55c46
parent	1b1fb7fab623e40f4ddc24d7b5ef7e48949e8a17

...	@@ -74,8 +74,8 @@ pub fn main() void {	...	@@ -74,8 +74,8 @@ pub fn main() void {
74		74
75	fn mainServer() !void {	75	fn mainServer() !void {
76	@disableInstrumentation();	76	@disableInstrumentation();
77	var stdin_reader = std.fs.File.stdin().readerStreaming(runner_threaded_io.io(), &stdin_buffer);	77	var stdin_reader = Io.File.stdin().readerStreaming(runner_threaded_io.io(), &stdin_buffer);
78	var stdout_writer = std.fs.File.stdout().writerStreaming(&stdout_buffer);	78	var stdout_writer = Io.File.stdout().writerStreaming(&stdout_buffer);
79	var server = try std.zig.Server.init(.{	79	var server = try std.zig.Server.init(.{
80	.in = &stdin_reader.interface,	80	.in = &stdin_reader.interface,
81	.out = &stdout_writer.interface,	81	.out = &stdout_writer.interface,
...	@@ -228,7 +228,7 @@ fn mainTerminal() void {	...	@@ -228,7 +228,7 @@ fn mainTerminal() void {
228	.root_name = "Test",	228	.root_name = "Test",
229	.estimated_total_items = test_fn_list.len,	229	.estimated_total_items = test_fn_list.len,
230	});	230	});
231	const have_tty = std.fs.File.stderr().isTty();	231	const have_tty = Io.File.stderr().isTty();
232		232
233	var leaks: usize = 0;	233	var leaks: usize = 0;
234	for (test_fn_list, 0..) \|test_fn, i\| {	234	for (test_fn_list, 0..) \|test_fn, i\| {
...	@@ -318,7 +318,7 @@ pub fn log(	...	@@ -318,7 +318,7 @@ pub fn log(
318	/// work-in-progress backends can handle it.	318	/// work-in-progress backends can handle it.
319	pub fn mainSimple() anyerror!void {	319	pub fn mainSimple() anyerror!void {
320	@disableInstrumentation();	320	@disableInstrumentation();
321	// is the backend capable of calling `std.fs.File.writeAll`?	321	// is the backend capable of calling `Io.File.writeAll`?
322	const enable_write = switch (builtin.zig_backend) {	322	const enable_write = switch (builtin.zig_backend) {
323	.stage2_aarch64, .stage2_riscv64 => true,	323	.stage2_aarch64, .stage2_riscv64 => true,
324	else => false,	324	else => false,
...	@@ -334,7 +334,7 @@ pub fn mainSimple() anyerror!void {	...	@@ -334,7 +334,7 @@ pub fn mainSimple() anyerror!void {
334	var failed: u64 = 0;	334	var failed: u64 = 0;
335		335
336	// we don't want to bring in File and Writer if the backend doesn't support it	336	// we don't want to bring in File and Writer if the backend doesn't support it
337	const stdout = if (enable_write) std.fs.File.stdout() else {};	337	const stdout = if (enable_write) Io.File.stdout() else {};
338		338
339	for (builtin.test_functions) \|test_fn\| {	339	for (builtin.test_functions) \|test_fn\| {
340	if (enable_write) {	340	if (enable_write) {

...	@@ -1,7 +1,8 @@	...	@@ -1,7 +1,8 @@
		1	const Writer = @This();
		2
1	const builtin = @import("builtin");	3	const builtin = @import("builtin");
2	const native_endian = builtin.target.cpu.arch.endian();	4	const native_endian = builtin.target.cpu.arch.endian();
3		5
4	const Writer = @This();
5	const std = @import("../std.zig");	6	const std = @import("../std.zig");
6	const assert = std.debug.assert;	7	const assert = std.debug.assert;
7	const Limit = std.Io.Limit;	8	const Limit = std.Io.Limit;
...	@@ -2837,7 +2838,7 @@ test "discarding sendFile" {	...	@@ -2837,7 +2838,7 @@ test "discarding sendFile" {
2837	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });	2838	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });
2838	defer file.close(io);	2839	defer file.close(io);
2839	var r_buffer: [256]u8 = undefined;	2840	var r_buffer: [256]u8 = undefined;
2840	var file_writer: std.fs.File.Writer = .init(file, &r_buffer);	2841	var file_writer: File.Writer = .init(file, &r_buffer);
2841	try file_writer.interface.writeByte('h');	2842	try file_writer.interface.writeByte('h');
2842	try file_writer.interface.flush();	2843	try file_writer.interface.flush();
2843		2844
...	@@ -2859,7 +2860,7 @@ test "allocating sendFile" {	...	@@ -2859,7 +2860,7 @@ test "allocating sendFile" {
2859	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });	2860	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });
2860	defer file.close(io);	2861	defer file.close(io);
2861	var r_buffer: [2]u8 = undefined;	2862	var r_buffer: [2]u8 = undefined;
2862	var file_writer: std.fs.File.Writer = .init(file, &r_buffer);	2863	var file_writer: File.Writer = .init(file, &r_buffer);
2863	try file_writer.interface.writeAll("abcd");	2864	try file_writer.interface.writeAll("abcd");
2864	try file_writer.interface.flush();	2865	try file_writer.interface.flush();
2865		2866
...	@@ -2883,7 +2884,7 @@ test sendFileReading {	...	@@ -2883,7 +2884,7 @@ test sendFileReading {
2883	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });	2884	const file = try tmp_dir.dir.createFile("input.txt", .{ .read = true });
2884	defer file.close(io);	2885	defer file.close(io);
2885	var r_buffer: [2]u8 = undefined;	2886	var r_buffer: [2]u8 = undefined;
2886	var file_writer: std.fs.File.Writer = .init(file, &r_buffer);	2887	var file_writer: File.Writer = .init(file, &r_buffer);
2887	try file_writer.interface.writeAll("abcd");	2888	try file_writer.interface.writeAll("abcd");
2888	try file_writer.interface.flush();	2889	try file_writer.interface.flush();
2889		2890

...	@@ -8,7 +8,7 @@ const posix = std.posix;	...	@@ -8,7 +8,7 @@ const posix = std.posix;
8	const fs = std.fs;	8	const fs = std.fs;
9	const testing = std.testing;	9	const testing = std.testing;
10	const Allocator = mem.Allocator;	10	const Allocator = mem.Allocator;
11	const File = std.fs.File;	11	const File = std.Io.File;
12	const windows = std.os.windows;	12	const windows = std.os.windows;
13		13
14	const builtin = @import("builtin");	14	const builtin = @import("builtin");
...	@@ -575,7 +575,7 @@ pub fn defaultPanic(	...	@@ -575,7 +575,7 @@ pub fn defaultPanic(
575	// A panic happened while trying to print a previous panic message.	575	// A panic happened while trying to print a previous panic message.
576	// We're still holding the mutex but that's fine as we're going to	576	// We're still holding the mutex but that's fine as we're going to
577	// call abort().	577	// call abort().
578	fs.File.stderr().writeAll("aborting due to recursive panic\n") catch {};	578	File.stderr().writeAll("aborting due to recursive panic\n") catch {};
579	},	579	},
580	else => {}, // Panicked while printing the recursive panic message.	580	else => {}, // Panicked while printing the recursive panic message.
581	}	581	}
...	@@ -1596,7 +1596,7 @@ pub fn defaultHandleSegfault(addr: ?usize, name: []const u8, opt_ctx: ?CpuContex	...	@@ -1596,7 +1596,7 @@ pub fn defaultHandleSegfault(addr: ?usize, name: []const u8, opt_ctx: ?CpuContex
1596	// A segfault happened while trying to print a previous panic message.	1596	// A segfault happened while trying to print a previous panic message.
1597	// We're still holding the mutex but that's fine as we're going to	1597	// We're still holding the mutex but that's fine as we're going to
1598	// call abort().	1598	// call abort().
1599	fs.File.stderr().writeAll("aborting due to recursive panic\n") catch {};	1599	File.stderr().writeAll("aborting due to recursive panic\n") catch {};
1600	},	1600	},
1601	else => {}, // Panicked while printing the recursive panic message.	1601	else => {}, // Panicked while printing the recursive panic message.
1602	}	1602	}

...	@@ -1200,7 +1200,7 @@ pub const EmbedFile = struct {	...	@@ -1200,7 +1200,7 @@ pub const EmbedFile = struct {
1200	/// `.none` means the file was not loaded, so `stat` is undefined.	1200	/// `.none` means the file was not loaded, so `stat` is undefined.
1201	val: InternPool.Index,	1201	val: InternPool.Index,
1202	/// If this is `null` and `val` is `.none`, the file has never been loaded.	1202	/// If this is `null` and `val` is `.none`, the file has never been loaded.
1203	err: ?(std.fs.File.OpenError \|\| std.fs.File.StatError \|\| std.fs.File.ReadError \|\| error{UnexpectedEof}),	1203	err: ?(Io.File.OpenError \|\| Io.File.StatError \|\| Io.File.ReadError \|\| error{UnexpectedEof}),
1204	stat: Cache.File.Stat,	1204	stat: Cache.File.Stat,
1205		1205
1206	pub const Index = enum(u32) {	1206	pub const Index = enum(u32) {
...	@@ -2927,7 +2927,7 @@ comptime {	...	@@ -2927,7 +2927,7 @@ comptime {
2927	}	2927	}
2928	}	2928	}
2929		2929
2930	pub fn loadZirCache(gpa: Allocator, io: Io, cache_file: std.fs.File) !Zir {	2930	pub fn loadZirCache(gpa: Allocator, io: Io, cache_file: Io.File) !Zir {
2931	var buffer: [2000]u8 = undefined;	2931	var buffer: [2000]u8 = undefined;
2932	var file_reader = cache_file.reader(io, &buffer);	2932	var file_reader = cache_file.reader(io, &buffer);
2933	return result: {	2933	return result: {
...	@@ -2986,7 +2986,7 @@ pub fn loadZirCacheBody(gpa: Allocator, header: Zir.Header, cache_br: *Io.Reader	...	@@ -2986,7 +2986,7 @@ pub fn loadZirCacheBody(gpa: Allocator, header: Zir.Header, cache_br: *Io.Reader
2986	return zir;	2986	return zir;
2987	}	2987	}
2988		2988
2989	pub fn saveZirCache(gpa: Allocator, cache_file: std.fs.File, stat: std.fs.File.Stat, zir: Zir) (std.fs.File.WriteError \|\| Allocator.Error)!void {	2989	pub fn saveZirCache(gpa: Allocator, cache_file: Io.File, stat: Io.File.Stat, zir: Zir) (Io.File.WriteError \|\| Allocator.Error)!void {
2990	const safety_buffer = if (data_has_safety_tag)	2990	const safety_buffer = if (data_has_safety_tag)
2991	try gpa.alloc([8]u8, zir.instructions.len)	2991	try gpa.alloc([8]u8, zir.instructions.len)
2992	else	2992	else
...	@@ -3026,7 +3026,7 @@ pub fn saveZirCache(gpa: Allocator, cache_file: std.fs.File, stat: std.fs.File.S	...	@@ -3026,7 +3026,7 @@ pub fn saveZirCache(gpa: Allocator, cache_file: std.fs.File, stat: std.fs.File.S
3026	};	3026	};
3027	}	3027	}
3028		3028
3029	pub fn saveZoirCache(cache_file: std.fs.File, stat: std.fs.File.Stat, zoir: Zoir) std.fs.File.WriteError!void {	3029	pub fn saveZoirCache(cache_file: Io.File, stat: Io.File.Stat, zoir: Zoir) Io.File.WriteError!void {
3030	const header: Zoir.Header = .{	3030	const header: Zoir.Header = .{
3031	.nodes_len = @intCast(zoir.nodes.len),	3031	.nodes_len = @intCast(zoir.nodes.len),
3032	.extra_len = @intCast(zoir.extra.len),	3032	.extra_len = @intCast(zoir.extra.len),

...	@@ -3651,7 +3651,7 @@ fn fileLookup(files: std.MultiArrayList(File.Entry), index: File.Index, zig_obje	...	@@ -3651,7 +3651,7 @@ fn fileLookup(files: std.MultiArrayList(File.Entry), index: File.Index, zig_obje
3651	pub fn addFileHandle(	3651	pub fn addFileHandle(
3652	gpa: Allocator,	3652	gpa: Allocator,
3653	file_handles: *std.ArrayList(File.Handle),	3653	file_handles: *std.ArrayList(File.Handle),
3654	handle: fs.File,	3654	handle: Io.File,
3655	) Allocator.Error!File.HandleIndex {	3655	) Allocator.Error!File.HandleIndex {
3656	try file_handles.append(gpa, handle);	3656	try file_handles.append(gpa, handle);
3657	return @intCast(file_handles.items.len - 1);	3657	return @intCast(file_handles.items.len - 1);
...	@@ -4068,7 +4068,7 @@ fn fmtDumpState(self: Elf, writer: std.Io.Writer) std.Io.Writer.Error!void {	...	@@ -4068,7 +4068,7 @@ fn fmtDumpState(self: Elf, writer: std.Io.Writer) std.Io.Writer.Error!void {
4068	}	4068	}
4069		4069
4070	/// Caller owns the memory.	4070	/// Caller owns the memory.
4071	pub fn preadAllAlloc(allocator: Allocator, handle: fs.File, offset: u64, size: u64) ![]u8 {	4071	pub fn preadAllAlloc(allocator: Allocator, handle: Io.File, offset: u64, size: u64) ![]u8 {
4072	const buffer = try allocator.alloc(u8, math.cast(usize, size) orelse return error.Overflow);	4072	const buffer = try allocator.alloc(u8, math.cast(usize, size) orelse return error.Overflow);
4073	errdefer allocator.free(buffer);	4073	errdefer allocator.free(buffer);
4074	const amt = try handle.preadAll(buffer, offset);	4074	const amt = try handle.preadAll(buffer, offset);
...	@@ -4460,6 +4460,7 @@ pub fn cast(elf_file: *Elf, comptime T: type, x: anytype) error{LinkFailure}!T {	...	@@ -4460,6 +4460,7 @@ pub fn cast(elf_file: *Elf, comptime T: type, x: anytype) error{LinkFailure}!T {
4460	}	4460	}
4461		4461
4462	const std = @import("std");	4462	const std = @import("std");
		4463	const Io = std.Io;
4463	const build_options = @import("build_options");	4464	const build_options = @import("build_options");
4464	const builtin = @import("builtin");	4465	const builtin = @import("builtin");
4465	const assert = std.debug.assert;	4466	const assert = std.debug.assert;

update all occurrences of std.fs.File to std.Io.File