authorgravatar for kappaloris@gmail.comLoris Cro <kappaloris@gmail.com> 2022-01-29 19:52:58+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-07-19 19:10:10-07:00
log75d39a97a29a4dee905a4c2b1f06444312be3a77
treee83e7c25460d2037b687e29d8d7a92ab4f888943
parent07ed8886b54ad09631d05cc835aa98bc81cb6ab4

autodocs: fix merge conflict

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

src/Autodoc.zig+1-1
...@@ -100,7 +100,7 @@ pub fn generateZirData(self: *Autodoc) !void {...@@ -100,7 +100,7 @@ pub fn generateZirData(self: *Autodoc) !void {
100 ) catch unreachable;100 ) catch unreachable;
101 out.print(";", .{}) catch unreachable;101 out.print(";", .{}) catch unreachable;
102 // copy main.js, index.html102 // copy main.js, index.html
103 const special = try self.module.comp.zig_lib_directory.join(gpa, &.{ "std", "special", "docs", std.fs.path.sep_str });103 const special = try self.module.comp.zig_lib_directory.join(self.arena, &.{ "std", "special", "docs", std.fs.path.sep_str });
104 var special_dir = std.fs.openDirAbsolute(special, .{}) catch unreachable;104 var special_dir = std.fs.openDirAbsolute(special, .{}) catch unreachable;
105 defer special_dir.close();105 defer special_dir.close();
106 special_dir.copyFile("main.js", output_dir, "main.js", .{}) catch unreachable;106 special_dir.copyFile("main.js", output_dir, "main.js", .{}) catch unreachable;