aboutsummaryrefslogtreecommitdiff
path: root/src/main.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2025-07-15 23:38:18 -0700
committerAndrew Kelley <andrew@ziglang.org>2025-07-16 17:20:02 -0700
commitc4776d66af3cec54a6f87337da714d388aa866da (patch)
tree4289adff4e2cf03f066ee09340f721f1fd2b921d /src/main.zig
parentb3ee5a6c303998e82cdf95bd522bd9769c3d1911 (diff)
downloadzig-c4776d66af3cec54a6f87337da714d388aa866da.tar.gz
zig-c4776d66af3cec54a6f87337da714d388aa866da.zip
update compiler
Diffstat (limited to 'src/main.zig')
-rw-r--r--src/main.zig24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/main.zig b/src/main.zig
index 37b137ea94..019ae8bc7e 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -4550,7 +4550,7 @@ fn cmdTranslateC(
error.SemanticAnalyzeFail => break :f .{ .error_bundle = errors },
};
defer tree.deinit(comp.gpa);
- break :f .{ .success = try tree.render(arena) };
+ break :f .{ .success = try tree.renderAlloc(arena) };
},
};
@@ -6058,7 +6058,8 @@ fn cmdAstCheck(
};
} else fs.File.stdin();
defer if (zig_source_path != null) f.close();
- break :s std.zig.readSourceFileToEndAlloc(arena, f, null) catch |err| {
+ var file_reader: fs.File.Reader = f.reader(&stdio_buffer);
+ break :s std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch |err| {
fatal("unable to load file '{s}' for ast-check: {s}", .{ display_path, @errorName(err) });
};
};
@@ -6416,14 +6417,16 @@ fn cmdChangelist(
var f = fs.cwd().openFile(old_source_path, .{}) catch |err|
fatal("unable to open old source file '{s}': {s}", .{ old_source_path, @errorName(err) });
defer f.close();
- break :source std.zig.readSourceFileToEndAlloc(arena, f, std.zig.max_src_size) catch |err|
+ var file_reader: fs.File.Reader = f.reader(&stdio_buffer);
+ break :source std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch |err|
fatal("unable to read old source file '{s}': {s}", .{ old_source_path, @errorName(err) });
};
const new_source = source: {
var f = fs.cwd().openFile(new_source_path, .{}) catch |err|
fatal("unable to open new source file '{s}': {s}", .{ new_source_path, @errorName(err) });
defer f.close();
- break :source std.zig.readSourceFileToEndAlloc(arena, f, std.zig.max_src_size) catch |err|
+ var file_reader: fs.File.Reader = f.reader(&stdio_buffer);
+ break :source std.zig.readSourceFileToEndAlloc(arena, &file_reader) catch |err|
fatal("unable to read new source file '{s}': {s}", .{ new_source_path, @errorName(err) });
};
@@ -6946,7 +6949,7 @@ fn cmdFetch(
ast.deinit(gpa);
}
- var fixups: Ast.Fixups = .{};
+ var fixups: Ast.Render.Fixups = .{};
defer fixups.deinit(gpa);
var saved_path_or_url = path_or_url;
@@ -7047,12 +7050,13 @@ fn cmdFetch(
try fixups.append_string_after_node.put(gpa, manifest.version_node, dependencies_text);
}
- var rendered = std.ArrayList(u8).init(gpa);
- defer rendered.deinit();
- try ast.renderToArrayList(&rendered, fixups);
+ var aw: std.Io.Writer.Allocating = .init(gpa);
+ defer aw.deinit();
+ try ast.render(gpa, &aw.writer, fixups);
+ const rendered = aw.getWritten();
- build_root.directory.handle.writeFile(.{ .sub_path = Package.Manifest.basename, .data = rendered.items }) catch |err| {
- fatal("unable to write {s} file: {s}", .{ Package.Manifest.basename, @errorName(err) });
+ build_root.directory.handle.writeFile(.{ .sub_path = Package.Manifest.basename, .data = rendered }) catch |err| {
+ fatal("unable to write {s} file: {t}", .{ Package.Manifest.basename, err });
};
return cleanExit();