zig

commit 75d39a97a29a4dee905a4c2b1f06444312be3a77 (tree)
parent 07ed8886b54ad09631d05cc835aa98bc81cb6ab4
Author: Loris Cro <kappaloris@gmail.com>
Date:   Sat, 29 Jan 2022 19:52:58 +0100

autodocs: fix merge conflict

Diffstat:
M
src/Autodoc.zig
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Autodoc.zig b/src/Autodoc.zig
@@ -100,7 +100,7 @@ pub fn generateZirData(self: *Autodoc) !void {
     ) catch unreachable;
     out.print(";", .{}) catch unreachable;
     // copy main.js, index.html
-    const special = try self.module.comp.zig_lib_directory.join(gpa, &.{ "std", "special", "docs", std.fs.path.sep_str });
+    const special = try self.module.comp.zig_lib_directory.join(self.arena, &.{ "std", "special", "docs", std.fs.path.sep_str });
     var special_dir = std.fs.openDirAbsolute(special, .{}) catch unreachable;
     defer special_dir.close();
     special_dir.copyFile("main.js", output_dir, "main.js", .{}) catch unreachable;