From c873c2eed9f9bcd4e8d8d6937ea7c3644d382440 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 7 Jul 2025 15:55:52 -0700 Subject: [PATCH] fix aro translate-c building from source --- lib/compiler/aro/aro/Driver.zig | 2 +- lib/compiler/aro_translate_c.zig | 3 ++- lib/docs/wasm/markdown.zig | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/compiler/aro/aro/Driver.zig b/lib/compiler/aro/aro/Driver.zig index 2fb1f0fe2f..f719e8cc15 100644 --- a/lib/compiler/aro/aro/Driver.zig +++ b/lib/compiler/aro/aro/Driver.zig @@ -519,7 +519,7 @@ fn option(arg: []const u8, name: []const u8) ?[]const u8 { fn addSource(d: *Driver, path: []const u8) !Source { if (mem.eql(u8, "-", path)) { - const stdin = std.fs.File.stdin().reader(); + const stdin = std.fs.File.stdin().deprecatedReader(); const input = try stdin.readAllAlloc(d.comp.gpa, std.math.maxInt(u32)); defer d.comp.gpa.free(input); return d.comp.addSourceFromBuffer("", input); diff --git a/lib/compiler/aro_translate_c.zig b/lib/compiler/aro_translate_c.zig index 8d3bbbd84b..939aede655 100644 --- a/lib/compiler/aro_translate_c.zig +++ b/lib/compiler/aro_translate_c.zig @@ -1781,7 +1781,8 @@ test "Macro matching" { fn renderErrorsAndExit(comp: *aro.Compilation) noreturn { defer std.process.exit(1); - var writer = aro.Diagnostics.defaultMsgWriter(std.io.tty.detectConfig(std.fs.File.stderr())); + var buffer: [1000]u8 = undefined; + var writer = aro.Diagnostics.defaultMsgWriter(std.io.tty.detectConfig(std.fs.File.stderr()), &buffer); defer writer.deinit(); // writer deinit must run *before* exit so that stderr is flushed var saw_error = false; diff --git a/lib/docs/wasm/markdown.zig b/lib/docs/wasm/markdown.zig index 7283e29b6a..3293b680c9 100644 --- a/lib/docs/wasm/markdown.zig +++ b/lib/docs/wasm/markdown.zig @@ -145,7 +145,7 @@ fn mainImpl() !void { var parser = try Parser.init(gpa); defer parser.deinit(); - var stdin_buf = std.io.bufferedReader(std.fs.File.stdin().reader()); + var stdin_buf = std.io.bufferedReader(std.fs.File.stdin().deprecatedReader()); var line_buf = std.ArrayList(u8).init(gpa); defer line_buf.deinit(); while (stdin_buf.reader().streamUntilDelimiter(line_buf.writer(), '\n', null)) {