mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-24 23:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Autodoc: fix root module name in sources.tar

Browse Source 
This was overlooked in #19458. Using the fully qualified name of each
module usually makes sense, but there is one module where it does not,
namely, the root module, since its name is `root`. The original Autodoc
tar creation logic used `comp.root_name` for the root module back when
it was the only module included in `sources.tar`, and that made sense.
Now, we get the best of both worlds, using the proper root name for the
root module while using the module name for the rest.
This commit is contained in:
Ian Johnson 2024-04-12 21:18:18 -04:00 committed by Andrew Kelley
parent f1c0f42cdd
commit 4fac5bd601
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Compilation.zig
View File

@ -3731,24 +3731,24 @@ fn docsCopyFallible(comp: *Compilation) anyerror!void {
}; };
defer tar_file.close(); defer tar_file.close();
var seen_table: std.AutoArrayHashMapUnmanaged(*Package.Module, void) = .{}; var seen_table: std.AutoArrayHashMapUnmanaged(*Package.Module, []const u8) = .{};
defer seen_table.deinit(comp.gpa); defer seen_table.deinit(comp.gpa);
try seen_table.put(comp.gpa, zcu.main_mod, {}); try seen_table.put(comp.gpa, zcu.main_mod, comp.root_name);
try seen_table.put(comp.gpa, zcu.std_mod, {}); try seen_table.put(comp.gpa, zcu.std_mod, zcu.std_mod.fully_qualified_name);
var i: usize = 0; var i: usize = 0;
while (i < seen_table.count()) : (i += 1) { while (i < seen_table.count()) : (i += 1) {
const mod = seen_table.keys()[i]; const mod = seen_table.keys()[i];
try comp.docsCopyModule(mod, tar_file); try comp.docsCopyModule(mod, seen_table.values()[i], tar_file);
const deps = mod.deps.values(); const deps = mod.deps.values();
try seen_table.ensureUnusedCapacity(comp.gpa, deps.len); try seen_table.ensureUnusedCapacity(comp.gpa, deps.len);
for (deps) |dep| seen_table.putAssumeCapacity(dep, {}); for (deps) |dep| seen_table.putAssumeCapacity(dep, dep.fully_qualified_name);
} }
} }
fn docsCopyModule(comp: *Compilation, module: *Package.Module, tar_file: std.fs.File) !void { fn docsCopyModule(comp: *Compilation, module: *Package.Module, name: []const u8, tar_file: std.fs.File) !void {
const root = module.root; const root = module.root;
const sub_path = if (root.sub_path.len == 0) "." else root.sub_path; const sub_path = if (root.sub_path.len == 0) "." else root.sub_path;
var mod_dir = root.root_dir.handle.openDir(sub_path, .{ .iterate = true }) catch |err| { var mod_dir = root.root_dir.handle.openDir(sub_path, .{ .iterate = true }) catch |err| {
@ -3788,7 +3788,7 @@ fn docsCopyModule(comp: *Compilation, module: *Package.Module, tar_file: std.fs.
var file_header = std.tar.output.Header.init(); var file_header = std.tar.output.Header.init();
file_header.typeflag = .regular; file_header.typeflag = .regular;
try file_header.setPath(module.fully_qualified_name, entry.path); try file_header.setPath(name, entry.path);
try file_header.setSize(stat.size); try file_header.setSize(stat.size);
try file_header.updateChecksum(); try file_header.updateChecksum();