From d5c1e6332724b9cbd692ef38ff329b6814ed63b9 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 24 Jun 2026 00:11:09 -0700
Subject: [PATCH] compiler: fix references to Compilation.Directories

---
 src/Compilation.zig | 8 ++++----
 src/Module.zig      | 2 +-
 src/main.zig        | 6 +++---
 src/print_env.zig   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Compilation.zig b/src/Compilation.zig
index da8844e0de453dd86ee07e2f2156d64cfaaf231f..3bdc049c3e3ba307a1430027567d50e39b346e1f 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -490,7 +490,7 @@ pub const Path = struct {
 
     /// From an unresolved path (which can be made of multiple not-yet-joined strings), construct a
     /// canonical `Path`.
-    pub fn fromUnresolved(gpa: Allocator, dirs: Compilation.Directories, unresolved_parts: []const []const u8) Allocator.Error!Path {
+    pub fn fromUnresolved(gpa: Allocator, dirs: std.zig.Directories, unresolved_parts: []const []const u8) Allocator.Error!Path {
         const resolved = try std.zig.resolvePath(gpa, dirs.cwd, unresolved_parts);
         errdefer gpa.free(resolved);
 
@@ -565,7 +565,7 @@ pub const Path = struct {
     /// `.global_cache` could still end up returning a `Path` with `Path.root == .zig_lib`.
     pub fn fromRoot(
         gpa: Allocator,
-        dirs: Compilation.Directories,
+        dirs: std.zig.Directories,
         root: Path.Root,
         sub_path: []const u8,
     ) Allocator.Error!Path {
@@ -588,7 +588,7 @@ pub const Path = struct {
     pub fn join(
         p: Path,
         gpa: Allocator,
-        dirs: Compilation.Directories,
+        dirs: std.zig.Directories,
         sub_path: []const u8,
     ) Allocator.Error!Path {
         // Currently, this just wraps `fromUnresolved` for simplicity. A more efficient impl is
@@ -609,7 +609,7 @@ pub const Path = struct {
     pub fn upJoin(
         p: Path,
         gpa: Allocator,
-        dirs: Compilation.Directories,
+        dirs: std.zig.Directories,
         sub_path: []const u8,
     ) Allocator.Error!Path {
         return .fromUnresolved(gpa, dirs, &.{
diff --git a/src/Module.zig b/src/Module.zig
index ff821831ef72aead6ea30c27b6f826e74875e507..b0d212070bd298f6d4980eddb4fe32a9fd43b363 100644
--- a/src/Module.zig
+++ b/src/Module.zig
@@ -457,7 +457,7 @@ pub fn createLimited(gpa: Allocator, options: LimitedOptions) Allocator.Error!*M
 }
 
 /// Does not ensure that the module's root directory exists on-disk; see `Builtin.updateFileOnDisk` for that task.
-pub fn createBuiltin(arena: Allocator, opts: Builtin, dirs: Compilation.Directories) Allocator.Error!*Module {
+pub fn createBuiltin(arena: Allocator, opts: Builtin, dirs: std.zig.Directories) Allocator.Error!*Module {
     const sub_path = "b" ++ std.fs.path.sep_str ++ Cache.binToHex(opts.hash());
     const new = try arena.create(Module);
     new.* = .{
diff --git a/src/main.zig b/src/main.zig
index 72d652ee3b8daccbe534f5856d4bdedd98615cd3..6402533471fca87cebdb5ae046d80aeb35601cf8 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -3218,7 +3218,7 @@ fn buildOutputType(
     const cwd_path = try std.zig.getResolvedCwd(io, arena);
 
     // This `init` calls `fatal` on error.
-    var dirs: Compilation.Directories = .init(
+    var dirs: std.zig.Directories = .init(
         arena,
         io,
         override_lib_dir,
@@ -3928,7 +3928,7 @@ fn buildOutputType(
 }
 
 const CreateModule = struct {
-    dirs: Compilation.Directories,
+    dirs: std.zig.Directories,
     modules: std.array_hash_map.String(CliModule),
     opts: Compilation.Config.Options,
     object_format: ?[]const u8,
@@ -4939,7 +4939,7 @@ fn jitCmdInner(
     const cwd_path = try std.zig.getResolvedCwd(io, arena);
 
     // This `init` calls `fatal` on error.
-    var dirs: Compilation.Directories = .init(
+    var dirs: std.zig.Directories = .init(
         arena,
         io,
         override_lib_dir,
diff --git a/src/print_env.zig b/src/print_env.zig
index 93e14781a184db46288b9c5e8c3d77e598820f2c..34264234ad234faf38bf5bd744e67b833899ce7d 100644
--- a/src/print_env.zig
+++ b/src/print_env.zig
@@ -30,7 +30,7 @@ pub fn cmdEnv(
 
     const cwd_path = try std.zig.getResolvedCwd(io, arena);
 
-    var dirs: Compilation.Directories = .init(
+    var dirs: std.zig.Directories = .init(
         arena,
         io,
         override_lib_dir,
-- 
2.54.0