mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-14 03:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

autodocs: fix merge conflict

Browse Source
This commit is contained in:
Loris Cro 2022-01-29 19:52:58 +01:00 committed by Andrew Kelley
parent 07ed8886b5
commit 75d39a97a2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Autodoc.zig
View File

@ -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;