Compilation: fix rebase conflict

andrewrk · andrewrk · commit 67e3e4989d5d · 2024-07-12T00:18:29.000-07:00
diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -2180,7 +2180,8 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {
             comp.astgen_work_queue.writeItemAssumeCapacity(file_index);
         }
         if (comp.file_system_inputs) |fsi| {
-            for (zcu.import_table.values()) |file| {
+            for (zcu.import_table.values()) |file_index| {
+                const file = zcu.fileByIndex(file_index);
                 try comp.appendFileSystemInput(fsi, file.mod.root, file.sub_file_path);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -2180,7 +2180,8 @@ pub fn update(comp: *Compilation, main_progress_node: std.Progress.Node) !void {`
`2180`	`2180`	`comp.astgen_work_queue.writeItemAssumeCapacity(file_index);`
`2181`	`2181`	`}`
`2182`	`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`	`2185`	`try comp.appendFileSystemInput(fsi, file.mod.root, file.sub_file_path);`
`2185`	`2186`	`}`
`2186`	`2187`	`}`