aboutsummaryrefslogtreecommitdiff
path: root/src/Module.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2023-10-07 22:34:45 -0700
committerAndrew Kelley <andrew@ziglang.org>2023-10-08 16:54:31 -0700
commite5c2a7dbca103b0c61bebaff95c5d5a5b777bd59 (patch)
tree2f41df7e7c01286ef102dc7a814aae6c7cdf5f84 /src/Module.zig
parent35d81c99c0f737f071e1ad0083342328dbb32acb (diff)
downloadzig-e5c2a7dbca103b0c61bebaff95c5d5a5b777bd59.tar.gz
zig-e5c2a7dbca103b0c61bebaff95c5d5a5b777bd59.zip
finish hooking up new dependency tree logic
* add Module instances for each package's build.zig and attach it to the dependencies.zig module with the hash digest hex string as the name. * fix incorrectly skipping the wrong packages for creating dependencies.zig * a couple more renaming of "package" to "module"
Diffstat (limited to 'src/Module.zig')
-rw-r--r--src/Module.zig6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Module.zig b/src/Module.zig
index 153edeafef..41f4ec2b41 100644
--- a/src/Module.zig
+++ b/src/Module.zig
@@ -4074,7 +4074,7 @@ pub fn importFile(
return mod.importPkg(pkg);
}
if (!mem.endsWith(u8, import_string, ".zig")) {
- return error.PackageNotFound;
+ return error.ModuleNotFound;
}
const gpa = mod.gpa;
@@ -4120,7 +4120,7 @@ pub fn importFile(
{
break :p try gpa.dupe(u8, resolved_path);
}
- return error.ImportOutsidePkgPath;
+ return error.ImportOutsideModulePath;
};
errdefer gpa.free(sub_file_path);
@@ -4206,7 +4206,7 @@ pub fn embedFile(mod: *Module, cur_file: *File, import_string: []const u8) !*Emb
{
break :p try gpa.dupe(u8, resolved_path);
}
- return error.ImportOutsidePkgPath;
+ return error.ImportOutsideModulePath;
};
errdefer gpa.free(sub_file_path);