rename src/Module.zig to src/Zcu.zig

This patch is a pure rename plus only changing the file path in
`@import` sites, so it is expected to not create version control
conflicts, even when rebasing.

CMakeLists.txt

@@ -513,7 +513,6 @@ set(ZIG_STAGE2_SOURCES
     src/InternPool.zig
     src/Liveness.zig
     src/Liveness/Verify.zig
-    src/Module.zig
     src/Package.zig
     src/Package/Fetch.zig
     src/Package/Fetch/git.zig
@@ -524,6 +523,7 @@ set(ZIG_STAGE2_SOURCES
     src/Sema/bitcast.zig
     src/Sema/comptime_ptr_access.zig
     src/Value.zig
+    src/Zcu.zig
     src/arch/aarch64/CodeGen.zig
     src/arch/aarch64/Emit.zig
     src/arch/aarch64/Mir.zig

src/Air.zig

@@ -11,7 +11,9 @@ const Air = @This();
 const Value = @import("Value.zig");
 const Type = @import("type.zig").Type;
 const InternPool = @import("InternPool.zig");
-const Module = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 
 instructions: std.MultiArrayList(Inst).Slice,
 /// The meaning of this data is determined by `Inst.Tag` value.

src/Builtin.zig

@@ -296,6 +296,6 @@ const build_options = @import("build_options");
 const Module = @import("Package/Module.zig");
 const assert = std.debug.assert;
 const AstGen = std.zig.AstGen;
-const File = @import("Module.zig").File;
+const File = @import("Zcu.zig").File;
 const Compilation = @import("Compilation.zig");
 const log = std.log.scoped(.builtin);

src/Compilation.zig

@@ -28,7 +28,7 @@ const libcxx = @import("libcxx.zig");
 const wasi_libc = @import("wasi_libc.zig");
 const fatal = @import("main.zig").fatal;
 const clangMain = @import("main.zig").clangMain;
-const Zcu = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
 /// Deprecated; use `Zcu`.
 const Module = Zcu;
 const InternPool = @import("InternPool.zig");

src/InternPool.zig

@@ -344,8 +344,9 @@ const Limb = std.math.big.Limb;
 const Hash = std.hash.Wyhash;
 
 const InternPool = @This();
-const Module = @import("Module.zig");
-const Zcu = Module;
+const Zcu = @import("Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Zir = std.zig.Zir;
 
 const KeyAdapter = struct {

src/Package/Module.zig

@@ -1,6 +1,4 @@
 //! Corresponds to something that Zig source code can `@import`.
-//! Not to be confused with src/Module.zig which will be renamed
-//! to Zcu. https://github.com/ziglang/zig/issues/14307
 
 /// Only files inside this directory can be imported.
 root: Cache.Path,
@@ -518,4 +516,4 @@ const Cache = std.Build.Cache;
 const Builtin = @import("../Builtin.zig");
 const assert = std.debug.assert;
 const Compilation = @import("../Compilation.zig");
-const File = @import("../Module.zig").File;
+const File = @import("../Zcu.zig").File;

src/RangeSet.zig

@@ -5,9 +5,11 @@ const Order = std.math.Order;
 const InternPool = @import("InternPool.zig");
 const Type = @import("type.zig").Type;
 const Value = @import("Value.zig");
-const Module = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const RangeSet = @This();
-const LazySrcLoc = @import("Module.zig").LazySrcLoc;
+const LazySrcLoc = Zcu.LazySrcLoc;
 
 ranges: std.ArrayList(Range),
 module: *Module,

src/Sema.zig

@@ -170,7 +170,7 @@ const MutableValue = @import("mutable_value.zig").MutableValue;
 const Type = @import("type.zig").Type;
 const Air = @import("Air.zig");
 const Zir = std.zig.Zir;
-const Zcu = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
 const Module = Zcu;
 const trace = @import("tracy.zig").trace;
 const Namespace = Module.Namespace;

src/Sema/bitcast.zig

@@ -765,7 +765,7 @@ const Allocator = std.mem.Allocator;
 const assert = std.debug.assert;
 
 const Sema = @import("../Sema.zig");
-const Zcu = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
 const InternPool = @import("../InternPool.zig");
 const Type = @import("../type.zig").Type;
 const Value = @import("../Value.zig");

src/Sema/comptime_ptr_access.zig

@@ -1056,5 +1056,5 @@ const Block = Sema.Block;
 const MutableValue = @import("../mutable_value.zig").MutableValue;
 const Type = @import("../type.zig").Type;
 const Value = @import("../Value.zig");
-const Zcu = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
 const LazySrcLoc = Zcu.LazySrcLoc;

src/Value.zig

@@ -6,7 +6,8 @@ const BigIntConst = std.math.big.int.Const;
 const BigIntMutable = std.math.big.int.Mutable;
 const Target = std.Target;
 const Allocator = std.mem.Allocator;
-const Zcu = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
+/// Deprecated.
 const Module = Zcu;
 const Sema = @import("Sema.zig");
 const InternPool = @import("InternPool.zig");

src/arch/aarch64/CodeGen.zig

@@ -11,7 +11,9 @@ const Liveness = @import("../../Liveness.zig");
 const Type = @import("../../type.zig").Type;
 const Value = @import("../../Value.zig");
 const link = @import("../../link.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../../InternPool.zig");
 const Compilation = @import("../../Compilation.zig");
 const ErrorMsg = Module.ErrorMsg;

src/arch/aarch64/Emit.zig

@@ -7,7 +7,9 @@ const math = std.math;
 const Mir = @import("Mir.zig");
 const bits = @import("bits.zig");
 const link = @import("../../link.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const ErrorMsg = Module.ErrorMsg;
 const assert = std.debug.assert;
 const Instruction = bits.Instruction;

src/arch/aarch64/abi.zig

@@ -4,7 +4,9 @@ const bits = @import("bits.zig");
 const Register = bits.Register;
 const RegisterManagerFn = @import("../../register_manager.zig").RegisterManager;
 const Type = @import("../../type.zig").Type;
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 
 pub const Class = union(enum) {
     memory,

src/arch/arm/CodeGen.zig

@@ -11,7 +11,9 @@ const Liveness = @import("../../Liveness.zig");
 const Type = @import("../../type.zig").Type;
 const Value = @import("../../Value.zig");
 const link = @import("../../link.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../../InternPool.zig");
 const Compilation = @import("../../Compilation.zig");
 const ErrorMsg = Module.ErrorMsg;

src/arch/arm/Emit.zig

@@ -8,7 +8,9 @@ const math = std.math;
 const Mir = @import("Mir.zig");
 const bits = @import("bits.zig");
 const link = @import("../../link.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Type = @import("../../type.zig").Type;
 const ErrorMsg = Module.ErrorMsg;
 const Target = std.Target;

src/arch/arm/abi.zig

@@ -4,7 +4,9 @@ const bits = @import("bits.zig");
 const Register = bits.Register;
 const RegisterManagerFn = @import("../../register_manager.zig").RegisterManager;
 const Type = @import("../../type.zig").Type;
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 
 pub const Class = union(enum) {
     memory,

src/arch/riscv64/CodeGen.zig

@@ -10,7 +10,9 @@ const Liveness = @import("../../Liveness.zig");
 const Type = @import("../../type.zig").Type;
 const Value = @import("../../Value.zig");
 const link = @import("../../link.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Package = @import("../../Package.zig");
 const InternPool = @import("../../InternPool.zig");
 const Compilation = @import("../../Compilation.zig");

src/arch/riscv64/Lower.zig

@@ -522,6 +522,8 @@ const Air = @import("../../Air.zig");
 const Allocator = std.mem.Allocator;
 const ErrorMsg = Module.ErrorMsg;
 const Mir = @import("Mir.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Instruction = encoder.Instruction;
 const Immediate = bits.Immediate;

src/arch/riscv64/abi.zig

@@ -4,7 +4,9 @@ const Register = bits.Register;
 const RegisterManagerFn = @import("../../register_manager.zig").RegisterManager;
 const Type = @import("../../type.zig").Type;
 const InternPool = @import("../../InternPool.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const assert = std.debug.assert;
 
 pub const Class = enum { memory, byval, integer, double_integer, fields };

src/arch/riscv64/bits.zig

@@ -4,7 +4,9 @@ const assert = std.debug.assert;
 const testing = std.testing;
 const Target = std.Target;
 
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Encoding = @import("Encoding.zig");
 const Mir = @import("Mir.zig");
 const abi = @import("abi.zig");

src/arch/sparc64/CodeGen.zig

@@ -10,7 +10,9 @@ const mem = std.mem;
 const Allocator = mem.Allocator;
 const builtin = @import("builtin");
 const link = @import("../../link.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../../InternPool.zig");
 const Value = @import("../../Value.zig");
 const ErrorMsg = Module.ErrorMsg;

src/arch/sparc64/Emit.zig

@@ -5,7 +5,9 @@ const std = @import("std");
 const Endian = std.builtin.Endian;
 const assert = std.debug.assert;
 const link = @import("../../link.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const ErrorMsg = Module.ErrorMsg;
 const Liveness = @import("../../Liveness.zig");
 const log = std.log.scoped(.sparcv9_emit);

src/arch/wasm/CodeGen.zig

@@ -10,7 +10,9 @@ const wasm = std.wasm;
 const log = std.log.scoped(.codegen);
 
 const codegen = @import("../../codegen.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../../InternPool.zig");
 const Decl = Module.Decl;
 const Type = @import("../../type.zig").Type;

src/arch/wasm/Emit.zig

@@ -5,7 +5,9 @@ const Emit = @This();
 const std = @import("std");
 const Mir = @import("Mir.zig");
 const link = @import("../../link.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../../InternPool.zig");
 const codegen = @import("../../codegen.zig");
 const leb128 = std.leb;

src/arch/wasm/abi.zig

@@ -9,7 +9,9 @@ const Target = std.Target;
 const assert = std.debug.assert;
 
 const Type = @import("../../type.zig").Type;
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 
 /// Defines how to pass a type as part of a function signature,
 /// both for parameters as well as return values.

src/arch/x86_64/CodeGen.zig

@@ -26,8 +26,9 @@ const Liveness = @import("../../Liveness.zig");
 const Lower = @import("Lower.zig");
 const Mir = @import("Mir.zig");
 const Package = @import("../../Package.zig");
-const Module = @import("../../Module.zig");
-const Zcu = Module;
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../../InternPool.zig");
 const Alignment = InternPool.Alignment;
 const Target = std.Target;

src/arch/x86_64/Lower.zig

@@ -664,7 +664,9 @@ const Lower = @This();
 const Memory = Instruction.Memory;
 const Mir = @import("Mir.zig");
 const Mnemonic = Instruction.Mnemonic;
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Operand = Instruction.Operand;
 const Prefix = Instruction.Prefix;
 const Register = bits.Register;

src/arch/x86_64/abi.zig

@@ -539,4 +539,4 @@ const Register = @import("bits.zig").Register;
 const RegisterManagerFn = @import("../../register_manager.zig").RegisterManager;
 const Type = @import("../../type.zig").Type;
 const Value = @import("../../Value.zig");
-const Zcu = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");

src/codegen.zig

@@ -16,7 +16,8 @@ const Compilation = @import("Compilation.zig");
 const ErrorMsg = Module.ErrorMsg;
 const InternPool = @import("InternPool.zig");
 const Liveness = @import("Liveness.zig");
-const Zcu = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
+/// Deprecated.
 const Module = Zcu;
 const Target = std.Target;
 const Type = @import("type.zig").Type;

src/codegen/c.zig

@@ -5,7 +5,7 @@ const mem = std.mem;
 const log = std.log.scoped(.c);
 
 const link = @import("../link.zig");
-const Zcu = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
 const Module = @import("../Package/Module.zig");
 const Compilation = @import("../Compilation.zig");
 const Value = @import("../Value.zig");

src/codegen/c/Type.zig

@@ -2584,5 +2584,5 @@ const CType = @This();
 const Module = @import("../../Package/Module.zig");
 const std = @import("std");
 const Type = @import("../../type.zig").Type;
-const Zcu = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
 const DeclIndex = @import("../../InternPool.zig").DeclIndex;

src/codegen/llvm.zig

@@ -14,8 +14,9 @@ else
 const link = @import("../link.zig");
 const Compilation = @import("../Compilation.zig");
 const build_options = @import("build_options");
-const Module = @import("../Module.zig");
-const Zcu = Module;
+const Zcu = @import("../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../InternPool.zig");
 const Package = @import("../Package.zig");
 const Air = @import("../Air.zig");

src/codegen/spirv.zig

@@ -5,7 +5,9 @@ const log = std.log.scoped(.codegen);
 const assert = std.debug.assert;
 const Signedness = std.builtin.Signedness;
 
-const Module = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Decl = Module.Decl;
 const Type = @import("../type.zig").Type;
 const Value = @import("../Value.zig");

src/crash_report.zig

@@ -8,11 +8,11 @@ const windows = std.os.windows;
 const posix = std.posix;
 const native_os = builtin.os.tag;
 
-const Module = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
 const Sema = @import("Sema.zig");
 const InternPool = @import("InternPool.zig");
 const Zir = std.zig.Zir;
-const Decl = Module.Decl;
+const Decl = Zcu.Decl;
 
 /// To use these crash report diagnostics, publish this panic in your main file
 /// and add `pub const enable_segfault_handler = false;` to your `std_options`.
@@ -78,7 +78,7 @@ fn dumpStatusReport() !void {
     const block: *Sema.Block = anal.block;
     const mod = anal.sema.mod;
 
-    const file, const src_base_node = Module.LazySrcLoc.resolveBaseNode(block.src_base_inst, mod);
+    const file, const src_base_node = Zcu.LazySrcLoc.resolveBaseNode(block.src_base_inst, mod);
 
     try stderr.writeAll("Analyzing ");
     try writeFilePath(file, stderr);
@@ -104,7 +104,7 @@ fn dumpStatusReport() !void {
     while (parent) |curr| {
         fba.reset();
         try stderr.writeAll("  in ");
-        const cur_block_file, const cur_block_src_base_node = Module.LazySrcLoc.resolveBaseNode(curr.block.src_base_inst, mod);
+        const cur_block_file, const cur_block_src_base_node = Zcu.LazySrcLoc.resolveBaseNode(curr.block.src_base_inst, mod);
         try writeFilePath(cur_block_file, stderr);
         try stderr.writeAll("\n    > ");
         print_zir.renderSingleInstruction(
@@ -128,7 +128,7 @@ fn dumpStatusReport() !void {
 
 var crash_heap: [16 * 4096]u8 = undefined;
 
-fn writeFilePath(file: *Module.File, writer: anytype) !void {
+fn writeFilePath(file: *Zcu.File, writer: anytype) !void {
     if (file.mod.root.root_dir.path) |path| {
         try writer.writeAll(path);
         try writer.writeAll(std.fs.path.sep_str);

src/link.zig

@@ -14,7 +14,9 @@ const Cache = std.Build.Cache;
 const Compilation = @import("Compilation.zig");
 const LibCInstallation = std.zig.LibCInstallation;
 const Liveness = @import("Liveness.zig");
-const Module = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("InternPool.zig");
 const Type = @import("type.zig").Type;
 const Value = @import("Value.zig");

src/link/C.zig

@@ -6,7 +6,7 @@ const fs = std.fs;
 
 const C = @This();
 const build_options = @import("build_options");
-const Zcu = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
 const Module = @import("../Package/Module.zig");
 const InternPool = @import("../InternPool.zig");
 const Alignment = InternPool.Alignment;

src/link/Coff.zig

@@ -2740,7 +2740,9 @@ const Compilation = @import("../Compilation.zig");
 const ImportTable = @import("Coff/ImportTable.zig");
 const Liveness = @import("../Liveness.zig");
 const LlvmObject = @import("../codegen/llvm.zig").Object;
-const Module = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../InternPool.zig");
 const Object = @import("Coff/Object.zig");
 const Relocation = @import("Coff/Relocation.zig");

src/link/Dwarf.zig

@@ -2964,7 +2964,9 @@ const File = link.File;
 const LinkBlock = File.LinkBlock;
 const LinkFn = File.LinkFn;
 const LinkerLoad = @import("../codegen.zig").LinkerLoad;
-const Module = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../InternPool.zig");
 const StringTable = @import("StringTable.zig");
 const Type = @import("../type.zig").Type;

src/link/Elf.zig

@@ -6466,7 +6466,9 @@ const Liveness = @import("../Liveness.zig");
 const LlvmObject = @import("../codegen/llvm.zig").Object;
 const MergeSection = merge_section.MergeSection;
 const MergeSubsection = merge_section.MergeSubsection;
-const Module = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Object = @import("Elf/Object.zig");
 const InternPool = @import("../InternPool.zig");
 const PltSection = synthetic_sections.PltSection;

src/link/Elf/ZigObject.zig

@@ -1648,7 +1648,9 @@ const Elf = @import("../Elf.zig");
 const File = @import("file.zig").File;
 const InternPool = @import("../../InternPool.zig");
 const Liveness = @import("../../Liveness.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Object = @import("Object.zig");
 const Symbol = @import("Symbol.zig");
 const StringTable = @import("../StringTable.zig");

src/link/MachO.zig

@@ -4861,7 +4861,9 @@ const LibStub = tapi.LibStub;
 const Liveness = @import("../Liveness.zig");
 const LlvmObject = @import("../codegen/llvm.zig").Object;
 const Md5 = std.crypto.hash.Md5;
-const Module = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../InternPool.zig");
 const RebaseSection = synthetic.RebaseSection;
 pub const Relocation = @import("MachO/Relocation.zig");

src/link/MachO/ZigObject.zig

@@ -1587,7 +1587,9 @@ const InternPool = @import("../../InternPool.zig");
 const Liveness = @import("../../Liveness.zig");
 const MachO = @import("../MachO.zig");
 const Nlist = Object.Nlist;
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Object = @import("Object.zig");
 const Relocation = @import("Relocation.zig");
 const Symbol = @import("Symbol.zig");

src/link/NvPtx.zig

@@ -12,7 +12,9 @@ const Allocator = std.mem.Allocator;
 const assert = std.debug.assert;
 const log = std.log.scoped(.link);
 
-const Module = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../InternPool.zig");
 const Compilation = @import("../Compilation.zig");
 const link = @import("../link.zig");

src/link/Plan9.zig

@@ -3,7 +3,9 @@
 
 const Plan9 = @This();
 const link = @import("../link.zig");
-const Module = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../InternPool.zig");
 const Compilation = @import("../Compilation.zig");
 const aout = @import("Plan9/aout.zig");
@@ -1046,8 +1048,6 @@ pub fn freeDecl(self: *Plan9, decl_index: InternPool.DeclIndex) void {
     const gpa = self.base.comp.gpa;
     // TODO audit the lifetimes of decls table entries. It's possible to get
     // freeDecl without any updateDecl in between.
-    // However that is planned to change, see the TODO comment in Module.zig
-    // in the deleteUnusedDecl function.
     const mod = self.base.comp.module.?;
     const decl = mod.declPtr(decl_index);
     const is_fn = decl.val.isFuncBody(mod);

src/link/SpirV.zig

@@ -27,7 +27,9 @@ const Allocator = std.mem.Allocator;
 const assert = std.debug.assert;
 const log = std.log.scoped(.link);
 
-const Module = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const InternPool = @import("../InternPool.zig");
 const Compilation = @import("../Compilation.zig");
 const link = @import("../link.zig");

src/link/Wasm.zig

@@ -28,7 +28,9 @@ const File = @import("Wasm/file.zig").File;
 const InternPool = @import("../InternPool.zig");
 const Liveness = @import("../Liveness.zig");
 const LlvmObject = @import("../codegen/llvm.zig").Object;
-const Module = @import("../Module.zig");
+const Zcu = @import("../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const Object = @import("Wasm/Object.zig");
 const Symbol = @import("Wasm/Symbol.zig");
 const Type = @import("../type.zig").Type;

src/link/Wasm/ZigObject.zig

@@ -1242,7 +1242,9 @@ const Dwarf = @import("../Dwarf.zig");
 const File = @import("file.zig").File;
 const InternPool = @import("../../InternPool.zig");
 const Liveness = @import("../../Liveness.zig");
-const Module = @import("../../Module.zig");
+const Zcu = @import("../../Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const StringTable = @import("../StringTable.zig");
 const Symbol = @import("Symbol.zig");
 const Type = @import("../../type.zig").Type;

src/main.zig

@@ -26,7 +26,9 @@ const wasi_libc = @import("wasi_libc.zig");
 const Cache = std.Build.Cache;
 const target_util = @import("target.zig");
 const crash_report = @import("crash_report.zig");
-const Module = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const AstGen = std.zig.AstGen;
 const mingw = @import("mingw.zig");
 const Server = std.zig.Server;

src/mutable_value.zig

@@ -1,7 +1,7 @@
 const std = @import("std");
 const assert = std.debug.assert;
 const Allocator = std.mem.Allocator;
-const Zcu = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
 const InternPool = @import("InternPool.zig");
 const Type = @import("type.zig").Type;
 const Value = @import("Value.zig");

src/print_air.zig

@@ -2,14 +2,14 @@ const std = @import("std");
 const Allocator = std.mem.Allocator;
 const fmtIntSizeBin = std.fmt.fmtIntSizeBin;
 
-const Module = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
 const Value = @import("Value.zig");
 const Type = @import("type.zig").Type;
 const Air = @import("Air.zig");
 const Liveness = @import("Liveness.zig");
 const InternPool = @import("InternPool.zig");
 
-pub fn write(stream: anytype, module: *Module, air: Air, liveness: ?Liveness) void {
+pub fn write(stream: anytype, module: *Zcu, air: Air, liveness: ?Liveness) void {
     const instruction_bytes = air.instructions.len *
         // Here we don't use @sizeOf(Air.Inst.Data) because it would include
         // the debug safety tag but we want to measure release size.
@@ -55,7 +55,7 @@ pub fn write(stream: anytype, module: *Module, air: Air, liveness: ?Liveness) vo
 pub fn writeInst(
     stream: anytype,
     inst: Air.Inst.Index,
-    module: *Module,
+    module: *Zcu,
     air: Air,
     liveness: ?Liveness,
 ) void {
@@ -70,16 +70,16 @@ pub fn writeInst(
     writer.writeInst(stream, inst) catch return;
 }
 
-pub fn dump(module: *Module, air: Air, liveness: ?Liveness) void {
+pub fn dump(module: *Zcu, air: Air, liveness: ?Liveness) void {
     write(std.io.getStdErr().writer(), module, air, liveness);
 }
 
-pub fn dumpInst(inst: Air.Inst.Index, module: *Module, air: Air, liveness: ?Liveness) void {
+pub fn dumpInst(inst: Air.Inst.Index, module: *Zcu, air: Air, liveness: ?Liveness) void {
     writeInst(std.io.getStdErr().writer(), inst, module, air, liveness);
 }
 
 const Writer = struct {
-    module: *Module,
+    module: *Zcu,
     gpa: Allocator,
     air: Air,
     liveness: ?Liveness,

src/print_value.zig

@@ -4,7 +4,8 @@
 const std = @import("std");
 const Type = @import("type.zig").Type;
 const Value = @import("Value.zig");
-const Zcu = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
+/// Deprecated.
 const Module = Zcu;
 const Sema = @import("Sema.zig");
 const InternPool = @import("InternPool.zig");

src/print_zir.zig

@@ -6,7 +6,7 @@ const Ast = std.zig.Ast;
 const InternPool = @import("InternPool.zig");
 
 const Zir = std.zig.Zir;
-const Zcu = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
 const Module = Zcu;
 const LazySrcLoc = Zcu.LazySrcLoc;
 

src/register_manager.zig

@@ -6,7 +6,9 @@ const Allocator = std.mem.Allocator;
 const Air = @import("Air.zig");
 const StaticBitSet = std.bit_set.StaticBitSet;
 const Type = @import("type.zig").Type;
-const Module = @import("Module.zig");
+const Zcu = @import("Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const expect = std.testing.expect;
 const expectEqual = std.testing.expectEqual;
 const expectEqualSlices = std.testing.expectEqualSlices;

src/target.zig

@@ -2,7 +2,7 @@ const std = @import("std");
 const Type = @import("type.zig").Type;
 const AddressSpace = std.builtin.AddressSpace;
 const Alignment = @import("InternPool.zig").Alignment;
-const Feature = @import("Module.zig").Feature;
+const Feature = @import("Zcu.zig").Feature;
 
 pub const default_stack_protector_buffer_size = 4;
 

src/type.zig

@@ -3,8 +3,9 @@ const builtin = @import("builtin");
 const Value = @import("Value.zig");
 const assert = std.debug.assert;
 const Target = std.Target;
-const Module = @import("Module.zig");
-const Zcu = Module;
+const Zcu = @import("Zcu.zig");
+/// Deprecated.
+const Module = Zcu;
 const log = std.log.scoped(.Type);
 const target_util = @import("target.zig");
 const Sema = @import("Sema.zig");