From b0395531d37db8ebde3d4cc09accef2f3b49457d Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 7 Jul 2025 19:49:50 -0700 Subject: [PATCH] update autodocs and langref to new API --- lib/docs/wasm/Walk.zig | 2 +- lib/docs/wasm/main.zig | 4 ++-- lib/docs/wasm/markdown/renderer.zig | 20 ++++++++++---------- tools/docgen.zig | 6 +++--- tools/doctest.zig | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/docs/wasm/Walk.zig b/lib/docs/wasm/Walk.zig index 65288b8878..688fcbd00a 100644 --- a/lib/docs/wasm/Walk.zig +++ b/lib/docs/wasm/Walk.zig @@ -440,7 +440,7 @@ fn parse(file_name: []const u8, source: []u8) Oom!Ast { const err_loc = std.zig.findLineColumn(ast.source, err_offset); rendered_err.clearRetainingCapacity(); try ast.renderError(err, rendered_err.writer(gpa)); - log.err("{s}:{}:{}: {s}", .{ file_name, err_loc.line + 1, err_loc.column + 1, rendered_err.items }); + log.err("{s}:{d}:{d}: {s}", .{ file_name, err_loc.line + 1, err_loc.column + 1, rendered_err.items }); } return Ast.parse(gpa, "", .zig); } diff --git a/lib/docs/wasm/main.zig b/lib/docs/wasm/main.zig index d886f8037c..7e9ffa5e4c 100644 --- a/lib/docs/wasm/main.zig +++ b/lib/docs/wasm/main.zig @@ -717,9 +717,9 @@ fn render_docs( try writer.writeAll("{}", .{markdown.fmtHtml(content)}); + try writer.print("\">{f}", .{markdown.fmtHtml(content)}); } else { - try writer.print("{}", .{markdown.fmtHtml(content)}); + try writer.print("{f}", .{markdown.fmtHtml(content)}); } try writer.writeAll(""); diff --git a/lib/docs/wasm/markdown/renderer.zig b/lib/docs/wasm/markdown/renderer.zig index b01bab7863..cba857d204 100644 --- a/lib/docs/wasm/markdown/renderer.zig +++ b/lib/docs/wasm/markdown/renderer.zig @@ -42,7 +42,7 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type { if (start == 1) { try writer.writeAll("
    \n"); } else { - try writer.print("
      \n", .{start}); + try writer.print("
        \n", .{start}); } } else { try writer.writeAll("
          \n"); @@ -106,15 +106,15 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type { } }, .heading => { - try writer.print("", .{data.heading.level}); + try writer.print("", .{data.heading.level}); for (doc.extraChildren(data.heading.children)) |child| { try r.renderFn(r, doc, child, writer); } - try writer.print("\n", .{data.heading.level}); + try writer.print("\n", .{data.heading.level}); }, .code_block => { const content = doc.string(data.code_block.content); - try writer.print("
          {}
          \n", .{fmtHtml(content)}); + try writer.print("
          {f}
          \n", .{fmtHtml(content)}); }, .blockquote => { try writer.writeAll("
          \n"); @@ -135,7 +135,7 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type { }, .link => { const target = doc.string(data.link.target); - try writer.print("", .{fmtHtml(target)}); + try writer.print("", .{fmtHtml(target)}); for (doc.extraChildren(data.link.children)) |child| { try r.renderFn(r, doc, child, writer); } @@ -143,11 +143,11 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type { }, .autolink => { const target = doc.string(data.text.content); - try writer.print("{0}", .{fmtHtml(target)}); + try writer.print("{0f}", .{fmtHtml(target)}); }, .image => { const target = doc.string(data.link.target); - try writer.print("\"", { const content = doc.string(data.text.content); - try writer.print("{}", .{fmtHtml(content)}); + try writer.print("{f}", .{fmtHtml(content)}); }, .text => { const content = doc.string(data.text.content); - try writer.print("{}", .{fmtHtml(content)}); + try writer.print("{f}", .{fmtHtml(content)}); }, .line_break => { try writer.writeAll("
          \n"); @@ -222,7 +222,7 @@ pub fn renderInlineNodeText( }, .autolink, .code_span, .text => { const content = doc.string(data.text.content); - try writer.print("{}", .{fmtHtml(content)}); + try writer.print("{f}", .{fmtHtml(content)}); }, .line_break => { try writer.writeAll("\n"); diff --git a/tools/docgen.zig b/tools/docgen.zig index f270b6b3b0..3f48ba39a8 100644 --- a/tools/docgen.zig +++ b/tools/docgen.zig @@ -75,9 +75,9 @@ pub fn main() !void { var code_dir = try fs.cwd().openDir(code_dir_path, .{}); defer code_dir.close(); - const input_file_bytes = try in_file.reader().readAllAlloc(arena, max_doc_file_size); + const input_file_bytes = try in_file.deprecatedReader().readAllAlloc(arena, max_doc_file_size); - var buffered_writer = io.bufferedWriter(out_file.writer()); + var buffered_writer = io.bufferedWriter(out_file.deprecatedWriter()); var tokenizer = Tokenizer.init(input_path, input_file_bytes); var toc = try genToc(arena, &tokenizer); @@ -425,7 +425,7 @@ fn genToc(allocator: Allocator, tokenizer: *Tokenizer) !Toc { try toc.writeByte('\n'); try toc.writeByteNTimes(' ', header_stack_size * 4); if (last_columns) |n| { - try toc.print("
            \n", .{n}); + try toc.print("
              \n", .{n}); } else { try toc.writeAll("
                \n"); } diff --git a/tools/doctest.zig b/tools/doctest.zig index 4c34ab00e0..8f9d1fe8cf 100644 --- a/tools/doctest.zig +++ b/tools/doctest.zig @@ -85,7 +85,7 @@ pub fn main() !void { var out_file = try fs.cwd().createFile(output_path, .{}); defer out_file.close(); - var bw = std.io.bufferedWriter(out_file.writer()); + var bw = std.io.bufferedWriter(out_file.deprecatedWriter()); const out = bw.writer(); try printSourceBlock(arena, out, source, fs.path.basename(input_path));