authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-08-11 16:20:57-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-09-24 20:01:19-07:00
loge5f4dbdf8aab9e5b17d2401b55493300235ab15b
tree71cfb4a5f02cefb12c4c6097d67410dc59529d79
parent2f00b630f299ff6809f821e1d6de63c45f2ed3df

fix rebase conflicts

4 files changed, 4 insertions(+), 4 deletions(-)

lib/compiler/aro/aro/Parser.zig+1-1
...@@ -32,7 +32,7 @@ const Type = TypeStore.Type;...@@ -32,7 +32,7 @@ const Type = TypeStore.Type;
32const QualType = TypeStore.QualType;32const QualType = TypeStore.QualType;
33const Value = @import("Value.zig");33const Value = @import("Value.zig");
3434
35const NodeList = std.ArrayList(Node.Index);35const NodeList = std.array_list.Managed(Node.Index);
36const Switch = struct {36const Switch = struct {
37 default: ?TokenIndex = null,37 default: ?TokenIndex = null,
38 ranges: std.array_list.Managed(Range),38 ranges: std.array_list.Managed(Range),
lib/compiler/aro/aro/Preprocessor.zig+1-1
...@@ -814,7 +814,7 @@ fn fatalNotFound(pp: *Preprocessor, tok: TokenWithExpansionLocs, filename: []con...@@ -814,7 +814,7 @@ fn fatalNotFound(pp: *Preprocessor, tok: TokenWithExpansionLocs, filename: []con
814 defer pp.diagnostics.state.fatal_errors = old;814 defer pp.diagnostics.state.fatal_errors = old;
815815
816 var sf = std.heap.stackFallback(1024, pp.gpa);816 var sf = std.heap.stackFallback(1024, pp.gpa);
817 var buf = std.ArrayList(u8).init(sf.get());817 var buf = std.array_list.Managed(u8).init(sf.get());
818 defer buf.deinit();818 defer buf.deinit();
819819
820 try buf.print("'{s}' not found", .{filename});820 try buf.print("'{s}' not found", .{filename});
src/Compilation.zig+1-1
...@@ -6603,7 +6603,7 @@ pub fn tmpFilePath(comp: Compilation, ally: Allocator, suffix: []const u8) error...@@ -6603,7 +6603,7 @@ pub fn tmpFilePath(comp: Compilation, ally: Allocator, suffix: []const u8) error
6603pub fn addTranslateCCArgs(6603pub fn addTranslateCCArgs(
6604 comp: *Compilation,6604 comp: *Compilation,
6605 arena: Allocator,6605 arena: Allocator,
6606 argv: *std.ArrayList([]const u8),6606 argv: *std.array_list.Managed([]const u8),
6607 ext: FileExt,6607 ext: FileExt,
6608 out_dep_path: ?[]const u8,6608 out_dep_path: ?[]const u8,
6609 owner_mod: *Package.Module,6609 owner_mod: *Package.Module,
src/main.zig+1-1
...@@ -4554,7 +4554,7 @@ fn cmdTranslateC(...@@ -4554,7 +4554,7 @@ fn cmdTranslateC(
4554 break :blk out_dep_path;4554 break :blk out_dep_path;
4555 };4555 };
45564556
4557 var argv = std.ArrayList([]const u8).init(arena);4557 var argv = std.array_list.Managed([]const u8).init(arena);
4558 try comp.addTranslateCCArgs(arena, &argv, ext, out_dep_path, comp.root_mod);4558 try comp.addTranslateCCArgs(arena, &argv, ext, out_dep_path, comp.root_mod);
4559 try argv.append(c_source_file.src_path);4559 try argv.append(c_source_file.src_path);
4560 if (comp.verbose_cc) Compilation.dump_argv(argv.items);4560 if (comp.verbose_cc) Compilation.dump_argv(argv.items);