authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-07 19:49:50-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-07 22:43:53-07:00
logb0395531d37db8ebde3d4cc09accef2f3b49457d
tree6faa75ff0685e59ad0c9c7487bbdd9cfc85822cc
parentd8e26275f29b304772bfeed9359e1ff5fe7038a8

update autodocs and langref to new API

5 files changed, 17 insertions(+), 17 deletions(-)

lib/docs/wasm/Walk.zig+1-1
...@@ -440,7 +440,7 @@ fn parse(file_name: []const u8, source: []u8) Oom!Ast {...@@ -440,7 +440,7 @@ fn parse(file_name: []const u8, source: []u8) Oom!Ast {
440 const err_loc = std.zig.findLineColumn(ast.source, err_offset);440 const err_loc = std.zig.findLineColumn(ast.source, err_offset);
441 rendered_err.clearRetainingCapacity();441 rendered_err.clearRetainingCapacity();
442 try ast.renderError(err, rendered_err.writer(gpa));442 try ast.renderError(err, rendered_err.writer(gpa));
443 log.err("{s}:{}:{}: {s}", .{ file_name, err_loc.line + 1, err_loc.column + 1, rendered_err.items });443 log.err("{s}:{d}:{d}: {s}", .{ file_name, err_loc.line + 1, err_loc.column + 1, rendered_err.items });
444 }444 }
445 return Ast.parse(gpa, "", .zig);445 return Ast.parse(gpa, "", .zig);
446 }446 }
lib/docs/wasm/main.zig+2-2
...@@ -717,9 +717,9 @@ fn render_docs(...@@ -717,9 +717,9 @@ fn render_docs(
717 try writer.writeAll("<a href=\"#");717 try writer.writeAll("<a href=\"#");
718 _ = missing_feature_url_escape;718 _ = missing_feature_url_escape;
719 try writer.writeAll(g.link_buffer.items);719 try writer.writeAll(g.link_buffer.items);
720 try writer.print("\">{}</a>", .{markdown.fmtHtml(content)});720 try writer.print("\">{f}</a>", .{markdown.fmtHtml(content)});
721 } else {721 } else {
722 try writer.print("{}", .{markdown.fmtHtml(content)});722 try writer.print("{f}", .{markdown.fmtHtml(content)});
723 }723 }
724724
725 try writer.writeAll("</code>");725 try writer.writeAll("</code>");
lib/docs/wasm/markdown/renderer.zig+10-10
...@@ -42,7 +42,7 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type {...@@ -42,7 +42,7 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type {
42 if (start == 1) {42 if (start == 1) {
43 try writer.writeAll("<ol>\n");43 try writer.writeAll("<ol>\n");
44 } else {44 } else {
45 try writer.print("<ol start=\"{}\">\n", .{start});45 try writer.print("<ol start=\"{d}\">\n", .{start});
46 }46 }
47 } else {47 } else {
48 try writer.writeAll("<ul>\n");48 try writer.writeAll("<ul>\n");
...@@ -106,15 +106,15 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type {...@@ -106,15 +106,15 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type {
106 }106 }
107 },107 },
108 .heading => {108 .heading => {
109 try writer.print("<h{}>", .{data.heading.level});109 try writer.print("<h{d}>", .{data.heading.level});
110 for (doc.extraChildren(data.heading.children)) |child| {110 for (doc.extraChildren(data.heading.children)) |child| {
111 try r.renderFn(r, doc, child, writer);111 try r.renderFn(r, doc, child, writer);
112 }112 }
113 try writer.print("</h{}>\n", .{data.heading.level});113 try writer.print("</h{d}>\n", .{data.heading.level});
114 },114 },
115 .code_block => {115 .code_block => {
116 const content = doc.string(data.code_block.content);116 const content = doc.string(data.code_block.content);
117 try writer.print("<pre><code>{}</code></pre>\n", .{fmtHtml(content)});117 try writer.print("<pre><code>{f}</code></pre>\n", .{fmtHtml(content)});
118 },118 },
119 .blockquote => {119 .blockquote => {
120 try writer.writeAll("<blockquote>\n");120 try writer.writeAll("<blockquote>\n");
...@@ -135,7 +135,7 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type {...@@ -135,7 +135,7 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type {
135 },135 },
136 .link => {136 .link => {
137 const target = doc.string(data.link.target);137 const target = doc.string(data.link.target);
138 try writer.print("<a href=\"{}\">", .{fmtHtml(target)});138 try writer.print("<a href=\"{f}\">", .{fmtHtml(target)});
139 for (doc.extraChildren(data.link.children)) |child| {139 for (doc.extraChildren(data.link.children)) |child| {
140 try r.renderFn(r, doc, child, writer);140 try r.renderFn(r, doc, child, writer);
141 }141 }
...@@ -143,11 +143,11 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type {...@@ -143,11 +143,11 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type {
143 },143 },
144 .autolink => {144 .autolink => {
145 const target = doc.string(data.text.content);145 const target = doc.string(data.text.content);
146 try writer.print("<a href=\"{0}\">{0}</a>", .{fmtHtml(target)});146 try writer.print("<a href=\"{0f}\">{0f}</a>", .{fmtHtml(target)});
147 },147 },
148 .image => {148 .image => {
149 const target = doc.string(data.link.target);149 const target = doc.string(data.link.target);
150 try writer.print("<img src=\"{}\" alt=\"", .{fmtHtml(target)});150 try writer.print("<img src=\"{f}\" alt=\"", .{fmtHtml(target)});
151 for (doc.extraChildren(data.link.children)) |child| {151 for (doc.extraChildren(data.link.children)) |child| {
152 try renderInlineNodeText(doc, child, writer);152 try renderInlineNodeText(doc, child, writer);
153 }153 }
...@@ -169,11 +169,11 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type {...@@ -169,11 +169,11 @@ pub fn Renderer(comptime Writer: type, comptime Context: type) type {
169 },169 },
170 .code_span => {170 .code_span => {
171 const content = doc.string(data.text.content);171 const content = doc.string(data.text.content);
172 try writer.print("<code>{}</code>", .{fmtHtml(content)});172 try writer.print("<code>{f}</code>", .{fmtHtml(content)});
173 },173 },
174 .text => {174 .text => {
175 const content = doc.string(data.text.content);175 const content = doc.string(data.text.content);
176 try writer.print("{}", .{fmtHtml(content)});176 try writer.print("{f}", .{fmtHtml(content)});
177 },177 },
178 .line_break => {178 .line_break => {
179 try writer.writeAll("<br />\n");179 try writer.writeAll("<br />\n");
...@@ -222,7 +222,7 @@ pub fn renderInlineNodeText(...@@ -222,7 +222,7 @@ pub fn renderInlineNodeText(
222 },222 },
223 .autolink, .code_span, .text => {223 .autolink, .code_span, .text => {
224 const content = doc.string(data.text.content);224 const content = doc.string(data.text.content);
225 try writer.print("{}", .{fmtHtml(content)});225 try writer.print("{f}", .{fmtHtml(content)});
226 },226 },
227 .line_break => {227 .line_break => {
228 try writer.writeAll("\n");228 try writer.writeAll("\n");
tools/docgen.zig+3-3
...@@ -75,9 +75,9 @@ pub fn main() !void {...@@ -75,9 +75,9 @@ pub fn main() !void {
75 var code_dir = try fs.cwd().openDir(code_dir_path, .{});75 var code_dir = try fs.cwd().openDir(code_dir_path, .{});
76 defer code_dir.close();76 defer code_dir.close();
7777
78 const input_file_bytes = try in_file.reader().readAllAlloc(arena, max_doc_file_size);78 const input_file_bytes = try in_file.deprecatedReader().readAllAlloc(arena, max_doc_file_size);
7979
80 var buffered_writer = io.bufferedWriter(out_file.writer());80 var buffered_writer = io.bufferedWriter(out_file.deprecatedWriter());
8181
82 var tokenizer = Tokenizer.init(input_path, input_file_bytes);82 var tokenizer = Tokenizer.init(input_path, input_file_bytes);
83 var toc = try genToc(arena, &tokenizer);83 var toc = try genToc(arena, &tokenizer);
...@@ -425,7 +425,7 @@ fn genToc(allocator: Allocator, tokenizer: *Tokenizer) !Toc {...@@ -425,7 +425,7 @@ fn genToc(allocator: Allocator, tokenizer: *Tokenizer) !Toc {
425 try toc.writeByte('\n');425 try toc.writeByte('\n');
426 try toc.writeByteNTimes(' ', header_stack_size * 4);426 try toc.writeByteNTimes(' ', header_stack_size * 4);
427 if (last_columns) |n| {427 if (last_columns) |n| {
428 try toc.print("<ul style=\"columns: {}\">\n", .{n});428 try toc.print("<ul style=\"columns: {d}\">\n", .{n});
429 } else {429 } else {
430 try toc.writeAll("<ul>\n");430 try toc.writeAll("<ul>\n");
431 }431 }
tools/doctest.zig+1-1
...@@ -85,7 +85,7 @@ pub fn main() !void {...@@ -85,7 +85,7 @@ pub fn main() !void {
85 var out_file = try fs.cwd().createFile(output_path, .{});85 var out_file = try fs.cwd().createFile(output_path, .{});
86 defer out_file.close();86 defer out_file.close();
8787
88 var bw = std.io.bufferedWriter(out_file.writer());88 var bw = std.io.bufferedWriter(out_file.deprecatedWriter());
89 const out = bw.writer();89 const out = bw.writer();
9090
91 try printSourceBlock(arena, out, source, fs.path.basename(input_path));91 try printSourceBlock(arena, out, source, fs.path.basename(input_path));