authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-07-12 00:18:29-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-07-12 00:18:29-07:00
log67e3e4989d5dc654ce5fef87d5a974caa05b9733
tree500cb70cb5b69bea25ae3a3f378feb99a96edc11
parent5a34e6c3e608e1f526bababd3a2a146f6216d045

Compilation: fix rebase conflict

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

src/Compilation.zig+2-1
...@@ -2180,7 +2180,8 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {...@@ -2180,7 +2180,8 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
2180 comp.astgen_work_queue.writeItemAssumeCapacity(file_index);2180 comp.astgen_work_queue.writeItemAssumeCapacity(file_index);
2181 }2181 }
2182 if (comp.file_system_inputs) |fsi| {2182 if (comp.file_system_inputs) |fsi| {
2183 for (zcu.import_table.values()) |file| {2183 for (zcu.import_table.values()) |file_index| {
2184 const file = zcu.fileByIndex(file_index);
2184 try comp.appendFileSystemInput(fsi, file.mod.root, file.sub_file_path);2185 try comp.appendFileSystemInput(fsi, file.mod.root, file.sub_file_path);
2185 }2186 }
2186 }2187 }