authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-18 06:42:41-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-18 06:42:54-07:00
log6e5589866193a6bd73c75b126adeecd71924b6f5
treef37daaea18c49f11f78a9b604f32aa9c7d128a6c
parent3ae0ba096d6ba9181a984d0745e1e079c67d62ff

Compilation: refactor std.fs -> fs

no functional change

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

src/Compilation.zig+51-51
......@@ -684,7 +684,7 @@ pub const Directories = struct {
684684 global,
685685 },
686686 wasi_preopens: switch (builtin.target.os.tag) {
687 .wasi => std.fs.wasi.Preopens,
687 .wasi => fs.wasi.Preopens,
688688 else => void,
689689 },
690690 self_exe_path: switch (builtin.target.os.tag) {
......@@ -741,7 +741,7 @@ pub const Directories = struct {
741741 .local_cache = local_cache,
742742 };
743743 }
744 fn openWasiPreopen(preopens: std.fs.wasi.Preopens, name: []const u8) Cache.Directory {
744 fn openWasiPreopen(preopens: fs.wasi.Preopens, name: []const u8) Cache.Directory {
745745 return .{
746746 .path = if (std.mem.eql(u8, name, ".")) null else name,
747747 .handle = .{
......@@ -755,8 +755,8 @@ pub const Directories = struct {
755755 };
756756 const nonempty_path = if (path.len == 0) "." else path;
757757 const handle_or_err = switch (thing) {
758 .@"zig lib" => std.fs.cwd().openDir(nonempty_path, .{}),
759 .@"global cache", .@"local cache" => std.fs.cwd().makeOpenPath(nonempty_path, .{}),
758 .@"zig lib" => fs.cwd().openDir(nonempty_path, .{}),
759 .@"global cache", .@"local cache" => fs.cwd().makeOpenPath(nonempty_path, .{}),
760760 };
761761 return .{
762762 .path = if (path.len == 0) null else path,
......@@ -993,7 +993,7 @@ pub const CObject = struct {
993993 const source_line = source_line: {
994994 if (diag.src_loc.offset == 0 or diag.src_loc.column == 0) break :source_line 0;
995995
996 const file = std.fs.cwd().openFile(file_name, .{}) catch break :source_line 0;
996 const file = fs.cwd().openFile(file_name, .{}) catch break :source_line 0;
997997 defer file.close();
998998 file.seekTo(diag.src_loc.offset + 1 - diag.src_loc.column) catch break :source_line 0;
999999
......@@ -1067,7 +1067,7 @@ pub const CObject = struct {
10671067 }
10681068 };
10691069
1070 const file = try std.fs.cwd().openFile(path, .{});
1070 const file = try fs.cwd().openFile(path, .{});
10711071 defer file.close();
10721072 var br = std.io.bufferedReader(file.deprecatedReader());
10731073 const reader = br.reader();
......@@ -1875,7 +1875,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
18751875 if (options.root_mod.resolved_target.llvm_cpu_features) |cf| print: {
18761876 std.debug.lockStdErr();
18771877 defer std.debug.unlockStdErr();
1878 const stderr = std.fs.File.stderr().deprecatedWriter();
1878 const stderr = fs.File.stderr().deprecatedWriter();
18791879 nosuspend {
18801880 stderr.print("compilation: {s}\n", .{options.root_name}) catch break :print;
18811881 stderr.print(" target: {s}\n", .{try target.zigTriple(arena)}) catch break :print;
......@@ -1901,7 +1901,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
19011901 .manifest_dir = try options.dirs.local_cache.handle.makeOpenPath("h", .{}),
19021902 };
19031903 // These correspond to std.zig.Server.Message.PathPrefix.
1904 cache.addPrefix(.{ .path = null, .handle = std.fs.cwd() });
1904 cache.addPrefix(.{ .path = null, .handle = fs.cwd() });
19051905 cache.addPrefix(options.dirs.zig_lib);
19061906 cache.addPrefix(options.dirs.local_cache);
19071907 cache.addPrefix(options.dirs.global_cache);
......@@ -2192,7 +2192,7 @@ pub fn create(gpa: Allocator, arena: Allocator, options: CreateOptions) !*Compil
21922192 comp.digest = hash.peekBin();
21932193 const digest = hash.final();
21942194
2195 const artifact_sub_dir = "o" ++ std.fs.path.sep_str ++ digest;
2195 const artifact_sub_dir = "o" ++ fs.path.sep_str ++ digest;
21962196 var artifact_dir = try options.dirs.local_cache.handle.makeOpenPath(artifact_sub_dir, .{});
21972197 errdefer artifact_dir.close();
21982198 const artifact_directory: Cache.Directory = .{
......@@ -2604,11 +2604,11 @@ fn cleanupAfterUpdate(comp: *Compilation, tmp_dir_rand_int: u64) void {
26042604 // temporary directories; it doesn't have a real cache directory anyway.
26052605 return;
26062606 }
2607 const tmp_dir_sub_path = "tmp" ++ std.fs.path.sep_str ++ std.fmt.hex(tmp_dir_rand_int);
2607 const tmp_dir_sub_path = "tmp" ++ fs.path.sep_str ++ std.fmt.hex(tmp_dir_rand_int);
26082608 comp.dirs.local_cache.handle.deleteTree(tmp_dir_sub_path) catch |err| {
26092609 log.warn("failed to delete temporary directory '{s}{c}{s}': {s}", .{
26102610 comp.dirs.local_cache.path orelse ".",
2611 std.fs.path.sep,
2611 fs.path.sep,
26122612 tmp_dir_sub_path,
26132613 @errorName(err),
26142614 });
......@@ -2628,11 +2628,11 @@ fn cleanupAfterUpdate(comp: *Compilation, tmp_dir_rand_int: u64) void {
26282628 if (whole.tmp_artifact_directory) |*tmp_dir| {
26292629 tmp_dir.handle.close();
26302630 whole.tmp_artifact_directory = null;
2631 const tmp_dir_sub_path = "tmp" ++ std.fs.path.sep_str ++ std.fmt.hex(tmp_dir_rand_int);
2631 const tmp_dir_sub_path = "tmp" ++ fs.path.sep_str ++ std.fmt.hex(tmp_dir_rand_int);
26322632 comp.dirs.local_cache.handle.deleteTree(tmp_dir_sub_path) catch |err| {
26332633 log.warn("failed to delete temporary directory '{s}{c}{s}': {s}", .{
26342634 comp.dirs.local_cache.path orelse ".",
2635 std.fs.path.sep,
2635 fs.path.sep,
26362636 tmp_dir_sub_path,
26372637 @errorName(err),
26382638 });
......@@ -2668,7 +2668,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
26682668 assert(none.tmp_artifact_directory == null);
26692669 none.tmp_artifact_directory = d: {
26702670 tmp_dir_rand_int = std.crypto.random.int(u64);
2671 const tmp_dir_sub_path = "tmp" ++ std.fs.path.sep_str ++ std.fmt.hex(tmp_dir_rand_int);
2671 const tmp_dir_sub_path = "tmp" ++ fs.path.sep_str ++ std.fmt.hex(tmp_dir_rand_int);
26722672 const path = try comp.dirs.local_cache.join(arena, &.{tmp_dir_sub_path});
26732673 break :d .{
26742674 .path = path,
......@@ -2735,7 +2735,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
27352735 // Compile the artifacts to a temporary directory.
27362736 whole.tmp_artifact_directory = d: {
27372737 tmp_dir_rand_int = std.crypto.random.int(u64);
2738 const tmp_dir_sub_path = "tmp" ++ std.fs.path.sep_str ++ std.fmt.hex(tmp_dir_rand_int);
2738 const tmp_dir_sub_path = "tmp" ++ fs.path.sep_str ++ std.fmt.hex(tmp_dir_rand_int);
27392739 const path = try comp.dirs.local_cache.join(arena, &.{tmp_dir_sub_path});
27402740 break :d .{
27412741 .path = path,
......@@ -2910,7 +2910,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
29102910 // Close tmp dir and link.File to avoid open handle during rename.
29112911 whole.tmp_artifact_directory.?.handle.close();
29122912 whole.tmp_artifact_directory = null;
2913 const s = std.fs.path.sep_str;
2913 const s = fs.path.sep_str;
29142914 const tmp_dir_sub_path = "tmp" ++ s ++ std.fmt.hex(tmp_dir_rand_int);
29152915 const o_sub_path = "o" ++ s ++ hex_digest;
29162916 renameTmpIntoCache(comp.dirs.local_cache, tmp_dir_sub_path, o_sub_path) catch |err| {
......@@ -2932,7 +2932,7 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
29322932 if (comp.bin_file) |lf| {
29332933 lf.emit = .{
29342934 .root_dir = comp.dirs.local_cache,
2935 .sub_path = try std.fs.path.join(arena, &.{ o_sub_path, comp.emit_bin.? }),
2935 .sub_path = try fs.path.join(arena, &.{ o_sub_path, comp.emit_bin.? }),
29362936 };
29372937
29382938 switch (need_writable_dance) {
......@@ -3105,7 +3105,7 @@ fn renameTmpIntoCache(
31053105) !void {
31063106 var seen_eaccess = false;
31073107 while (true) {
3108 std.fs.rename(
3108 fs.rename(
31093109 cache_directory.handle,
31103110 tmp_dir_sub_path,
31113111 cache_directory.handle,
......@@ -3931,7 +3931,7 @@ pub fn getAllErrorsAlloc(comp: *Compilation) !ErrorBundle {
39313931 // This AU is referenced and has a transitive compile error, meaning it referenced something with a compile error.
39323932 // However, we haven't reported any such error.
39333933 // This is a compiler bug.
3934 const stderr = std.fs.File.stderr().deprecatedWriter();
3934 const stderr = fs.File.stderr().deprecatedWriter();
39353935 try stderr.writeAll("referenced transitive analysis errors, but none actually emitted\n");
39363936 try stderr.print("{f} [transitive failure]\n", .{zcu.fmtAnalUnit(failed_unit)});
39373937 while (ref) |r| {
......@@ -4842,7 +4842,7 @@ fn docsCopyFallible(comp: *Compilation) anyerror!void {
48424842 defer out_dir.close();
48434843
48444844 for (&[_][]const u8{ "docs/main.js", "docs/index.html" }) |sub_path| {
4845 const basename = std.fs.path.basename(sub_path);
4845 const basename = fs.path.basename(sub_path);
48464846 comp.dirs.zig_lib.handle.copyFile(sub_path, out_dir, basename, .{}) catch |err| {
48474847 comp.lockAndSetMiscFailure(.docs_copy, "unable to copy {s}: {s}", .{
48484848 sub_path,
......@@ -4878,7 +4878,7 @@ fn docsCopyFallible(comp: *Compilation) anyerror!void {
48784878 }
48794879}
48804880
4881fn docsCopyModule(comp: *Compilation, module: *Package.Module, name: []const u8, tar_file: std.fs.File) !void {
4881fn docsCopyModule(comp: *Compilation, module: *Package.Module, name: []const u8, tar_file: fs.File) !void {
48824882 const root = module.root;
48834883 var mod_dir = d: {
48844884 const root_dir, const sub_path = root.openInfo(comp.dirs);
......@@ -4973,7 +4973,7 @@ fn workerDocsWasmFallible(comp: *Compilation, prog_node: std.Progress.Node) anye
49734973 });
49744974
49754975 const src_basename = "main.zig";
4976 const root_name = std.fs.path.stem(src_basename);
4976 const root_name = fs.path.stem(src_basename);
49774977
49784978 const dirs = comp.dirs.withoutLocalCache();
49794979
......@@ -5068,13 +5068,13 @@ fn workerUpdateFile(
50685068 prog_node: std.Progress.Node,
50695069 wg: *WaitGroup,
50705070) void {
5071 const child_prog_node = prog_node.start(std.fs.path.basename(file.path.sub_path), 0);
5071 const child_prog_node = prog_node.start(fs.path.basename(file.path.sub_path), 0);
50725072 defer child_prog_node.end();
50735073
50745074 const pt: Zcu.PerThread = .activate(comp.zcu.?, @enumFromInt(tid));
50755075 defer pt.deactivate();
50765076 pt.updateFile(file_index, file) catch |err| {
5077 pt.reportRetryableFileError(file_index, "unable to load '{s}': {s}", .{ std.fs.path.basename(file.path.sub_path), @errorName(err) }) catch |oom| switch (oom) {
5077 pt.reportRetryableFileError(file_index, "unable to load '{s}': {s}", .{ fs.path.basename(file.path.sub_path), @errorName(err) }) catch |oom| switch (oom) {
50785078 error.OutOfMemory => {
50795079 comp.mutex.lock();
50805080 defer comp.mutex.unlock();
......@@ -5239,7 +5239,7 @@ pub fn cImport(comp: *Compilation, c_src: []const u8, owner_mod: *Package.Module
52395239 const arena = arena_allocator.allocator();
52405240
52415241 const tmp_digest = man.hash.peek();
5242 const tmp_dir_sub_path = try std.fs.path.join(arena, &[_][]const u8{ "o", &tmp_digest });
5242 const tmp_dir_sub_path = try fs.path.join(arena, &[_][]const u8{ "o", &tmp_digest });
52435243 var zig_cache_tmp_dir = try comp.dirs.local_cache.handle.makeOpenPath(tmp_dir_sub_path, .{});
52445244 defer zig_cache_tmp_dir.close();
52455245 const cimport_basename = "cimport.h";
......@@ -5308,7 +5308,7 @@ pub fn cImport(comp: *Compilation, c_src: []const u8, owner_mod: *Package.Module
53085308 log.info("C import .d file: {s}", .{out_dep_path});
53095309 }
53105310
5311 const dep_basename = std.fs.path.basename(out_dep_path);
5311 const dep_basename = fs.path.basename(out_dep_path);
53125312 try man.addDepFilePost(zig_cache_tmp_dir, dep_basename);
53135313 switch (comp.cache_use) {
53145314 .whole => |whole| if (whole.cache_manifest) |whole_cache_manifest| {
......@@ -5321,7 +5321,7 @@ pub fn cImport(comp: *Compilation, c_src: []const u8, owner_mod: *Package.Module
53215321
53225322 const bin_digest = man.finalBin();
53235323 const hex_digest = Cache.binToHex(bin_digest);
5324 const o_sub_path = "o" ++ std.fs.path.sep_str ++ hex_digest;
5324 const o_sub_path = "o" ++ fs.path.sep_str ++ hex_digest;
53255325 var o_dir = try comp.dirs.local_cache.handle.makeOpenPath(o_sub_path, .{});
53265326 defer o_dir.close();
53275327
......@@ -5674,7 +5674,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr
56745674 defer arena_allocator.deinit();
56755675 const arena = arena_allocator.allocator();
56765676
5677 const c_source_basename = std.fs.path.basename(c_object.src.src_path);
5677 const c_source_basename = fs.path.basename(c_object.src.src_path);
56785678
56795679 const child_progress_node = c_obj_prog_node.start(c_source_basename, 0);
56805680 defer child_progress_node.end();
......@@ -5687,7 +5687,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr
56875687 const o_basename_noext = if (direct_o)
56885688 comp.root_name
56895689 else
5690 c_source_basename[0 .. c_source_basename.len - std.fs.path.extension(c_source_basename).len];
5690 c_source_basename[0 .. c_source_basename.len - fs.path.extension(c_source_basename).len];
56915691
56925692 const target = comp.getTarget();
56935693 const o_ext = target.ofmt.fileExt(target.cpu.arch);
......@@ -5814,11 +5814,11 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr
58145814 }
58155815
58165816 // Just to save disk space, we delete the files that are never needed again.
5817 defer if (out_diag_path) |diag_file_path| zig_cache_tmp_dir.deleteFile(std.fs.path.basename(diag_file_path)) catch |err| switch (err) {
5817 defer if (out_diag_path) |diag_file_path| zig_cache_tmp_dir.deleteFile(fs.path.basename(diag_file_path)) catch |err| switch (err) {
58185818 error.FileNotFound => {}, // the file wasn't created due to an error we reported
58195819 else => log.warn("failed to delete '{s}': {s}", .{ diag_file_path, @errorName(err) }),
58205820 };
5821 defer if (out_dep_path) |dep_file_path| zig_cache_tmp_dir.deleteFile(std.fs.path.basename(dep_file_path)) catch |err| switch (err) {
5821 defer if (out_dep_path) |dep_file_path| zig_cache_tmp_dir.deleteFile(fs.path.basename(dep_file_path)) catch |err| switch (err) {
58225822 error.FileNotFound => {}, // the file wasn't created due to an error we reported
58235823 else => log.warn("failed to delete '{s}': {s}", .{ dep_file_path, @errorName(err) }),
58245824 };
......@@ -5889,7 +5889,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr
58895889 }
58905890
58915891 if (out_dep_path) |dep_file_path| {
5892 const dep_basename = std.fs.path.basename(dep_file_path);
5892 const dep_basename = fs.path.basename(dep_file_path);
58935893 // Add the files depended on to the cache system.
58945894 try man.addDepFilePost(zig_cache_tmp_dir, dep_basename);
58955895 switch (comp.cache_use) {
......@@ -5909,11 +5909,11 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr
59095909
59105910 // Rename into place.
59115911 const digest = man.final();
5912 const o_sub_path = try std.fs.path.join(arena, &[_][]const u8{ "o", &digest });
5912 const o_sub_path = try fs.path.join(arena, &[_][]const u8{ "o", &digest });
59135913 var o_dir = try comp.dirs.local_cache.handle.makeOpenPath(o_sub_path, .{});
59145914 defer o_dir.close();
5915 const tmp_basename = std.fs.path.basename(out_obj_path);
5916 try std.fs.rename(zig_cache_tmp_dir, tmp_basename, o_dir, o_basename);
5915 const tmp_basename = fs.path.basename(out_obj_path);
5916 try fs.rename(zig_cache_tmp_dir, tmp_basename, o_dir, o_basename);
59175917 break :blk digest;
59185918 };
59195919
......@@ -5935,7 +5935,7 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: std.Pr
59355935 .success = .{
59365936 .object_path = .{
59375937 .root_dir = comp.dirs.local_cache,
5938 .sub_path = try std.fs.path.join(gpa, &.{ "o", &digest, o_basename }),
5938 .sub_path = try fs.path.join(gpa, &.{ "o", &digest, o_basename }),
59395939 },
59405940 .lock = man.toOwnedLock(),
59415941 },
......@@ -5959,7 +5959,7 @@ fn updateWin32Resource(comp: *Compilation, win32_resource: *Win32Resource, win32
59595959 .rc => |rc_src| rc_src.src_path,
59605960 .manifest => |src_path| src_path,
59615961 };
5962 const src_basename = std.fs.path.basename(src_path);
5962 const src_basename = fs.path.basename(src_path);
59635963
59645964 log.debug("updating win32 resource: {s}", .{src_path});
59655965
......@@ -5996,7 +5996,7 @@ fn updateWin32Resource(comp: *Compilation, win32_resource: *Win32Resource, win32
59965996 // get the digest now and write the .res directly to the cache
59975997 const digest = man.final();
59985998
5999 const o_sub_path = try std.fs.path.join(arena, &.{ "o", &digest });
5999 const o_sub_path = try fs.path.join(arena, &.{ "o", &digest });
60006000 var o_dir = try comp.dirs.local_cache.handle.makeOpenPath(o_sub_path, .{});
60016001 defer o_dir.close();
60026002
......@@ -6082,7 +6082,7 @@ fn updateWin32Resource(comp: *Compilation, win32_resource: *Win32Resource, win32
60826082 _ = try man.addFile(rc_src.src_path, null);
60836083 man.hash.addListOfBytes(rc_src.extra_flags);
60846084
6085 const rc_basename_noext = src_basename[0 .. src_basename.len - std.fs.path.extension(src_basename).len];
6085 const rc_basename_noext = src_basename[0 .. src_basename.len - fs.path.extension(src_basename).len];
60866086
60876087 const digest = if (try man.hit()) man.final() else blk: {
60886088 var zig_cache_tmp_dir = try comp.dirs.local_cache.handle.makeOpenPath("tmp", .{});
......@@ -6127,7 +6127,7 @@ fn updateWin32Resource(comp: *Compilation, win32_resource: *Win32Resource, win32
61276127
61286128 // Read depfile and update cache manifest
61296129 {
6130 const dep_basename = std.fs.path.basename(out_dep_path);
6130 const dep_basename = fs.path.basename(out_dep_path);
61316131 const dep_file_contents = try zig_cache_tmp_dir.readFileAlloc(arena, dep_basename, 50 * 1024 * 1024);
61326132 defer arena.free(dep_file_contents);
61336133
......@@ -6155,11 +6155,11 @@ fn updateWin32Resource(comp: *Compilation, win32_resource: *Win32Resource, win32
61556155
61566156 // Rename into place.
61576157 const digest = man.final();
6158 const o_sub_path = try std.fs.path.join(arena, &[_][]const u8{ "o", &digest });
6158 const o_sub_path = try fs.path.join(arena, &[_][]const u8{ "o", &digest });
61596159 var o_dir = try comp.dirs.local_cache.handle.makeOpenPath(o_sub_path, .{});
61606160 defer o_dir.close();
6161 const tmp_basename = std.fs.path.basename(out_res_path);
6162 try std.fs.rename(zig_cache_tmp_dir, tmp_basename, o_dir, res_filename);
6161 const tmp_basename = fs.path.basename(out_res_path);
6162 try fs.rename(zig_cache_tmp_dir, tmp_basename, o_dir, res_filename);
61636163 break :blk digest;
61646164 };
61656165
......@@ -6270,7 +6270,7 @@ fn spawnZigRc(
62706270}
62716271
62726272pub fn tmpFilePath(comp: Compilation, ally: Allocator, suffix: []const u8) error{OutOfMemory}![]const u8 {
6273 const s = std.fs.path.sep_str;
6273 const s = fs.path.sep_str;
62746274 const rand_int = std.crypto.random.int(u64);
62756275 if (comp.dirs.local_cache.path) |p| {
62766276 return std.fmt.allocPrint(ally, "{s}" ++ s ++ "tmp" ++ s ++ "{x}-{s}", .{ p, rand_int, suffix });
......@@ -6520,12 +6520,12 @@ pub fn addCCArgs(
65206520
65216521 if (comp.config.link_libcpp) {
65226522 try argv.append("-isystem");
6523 try argv.append(try std.fs.path.join(arena, &[_][]const u8{
6523 try argv.append(try fs.path.join(arena, &[_][]const u8{
65246524 comp.dirs.zig_lib.path.?, "libcxx", "include",
65256525 }));
65266526
65276527 try argv.append("-isystem");
6528 try argv.append(try std.fs.path.join(arena, &[_][]const u8{
6528 try argv.append(try fs.path.join(arena, &[_][]const u8{
65296529 comp.dirs.zig_lib.path.?, "libcxxabi", "include",
65306530 }));
65316531
......@@ -6536,7 +6536,7 @@ pub fn addCCArgs(
65366536 // However as noted by @dimenus, appending libc headers before compiler headers breaks
65376537 // intrinsics and other compiler specific items.
65386538 try argv.append("-isystem");
6539 try argv.append(try std.fs.path.join(arena, &.{ comp.dirs.zig_lib.path.?, "include" }));
6539 try argv.append(try fs.path.join(arena, &.{ comp.dirs.zig_lib.path.?, "include" }));
65406540
65416541 try argv.ensureUnusedCapacity(comp.libc_include_dir_list.len * 2);
65426542 for (comp.libc_include_dir_list) |include_dir| {
......@@ -6554,7 +6554,7 @@ pub fn addCCArgs(
65546554
65556555 if (comp.config.link_libunwind) {
65566556 try argv.append("-isystem");
6557 try argv.append(try std.fs.path.join(arena, &[_][]const u8{
6557 try argv.append(try fs.path.join(arena, &[_][]const u8{
65586558 comp.dirs.zig_lib.path.?, "libunwind", "include",
65596559 }));
65606560 }
......@@ -7147,7 +7147,7 @@ fn get_libc_crt_file(comp: *Compilation, arena: Allocator, basename: []const u8)
71477147 return (try crtFilePath(&comp.crt_files, basename)) orelse {
71487148 const lci = comp.libc_installation orelse return error.LibCInstallationNotAvailable;
71497149 const crt_dir_path = lci.crt_dir orelse return error.LibCInstallationMissingCrtDir;
7150 const full_path = try std.fs.path.join(arena, &[_][]const u8{ crt_dir_path, basename });
7150 const full_path = try fs.path.join(arena, &[_][]const u8{ crt_dir_path, basename });
71517151 return Cache.Path.initCwd(full_path);
71527152 };
71537153}
......@@ -7211,7 +7211,7 @@ pub fn lockAndSetMiscFailure(
72117211pub fn dump_argv(argv: []const []const u8) void {
72127212 std.debug.lockStdErr();
72137213 defer std.debug.unlockStdErr();
7214 const stderr = std.fs.File.stderr().deprecatedWriter();
7214 const stderr = fs.File.stderr().deprecatedWriter();
72157215 for (argv[0 .. argv.len - 1]) |arg| {
72167216 nosuspend stderr.print("{s} ", .{arg}) catch return;
72177217 }
......@@ -7542,7 +7542,7 @@ pub fn toCrtFile(comp: *Compilation) Allocator.Error!CrtFile {
75427542 return .{
75437543 .full_object_path = .{
75447544 .root_dir = comp.dirs.local_cache,
7545 .sub_path = try std.fs.path.join(comp.gpa, &.{
7545 .sub_path = try fs.path.join(comp.gpa, &.{
75467546 "o",
75477547 &Cache.binToHex(comp.digest.?),
75487548 comp.emit_bin.?,