mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix rebase conflicts

Browse source
This commit is contained in:
Andrew Kelley 2025-08-11 16:20:57 -07:00
parent 2f00b630f2
commit e5f4dbdf8a
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/compiler/aro/aro/Parser.zig vendored
View file

@ -32,7 +32,7 @@ const Type = TypeStore.Type;
const QualType = TypeStore.QualType;
const Value = @import("Value.zig");
const NodeList = std.ArrayList(Node.Index);
const NodeList = std.array_list.Managed(Node.Index);
const Switch = struct {
default: ?TokenIndex = null,
ranges: std.array_list.Managed(Range),

2
lib/compiler/aro/aro/Preprocessor.zig vendored
View file

@ -814,7 +814,7 @@ fn fatalNotFound(pp: *Preprocessor, tok: TokenWithExpansionLocs, filename: []con
defer pp.diagnostics.state.fatal_errors = old;
var sf = std.heap.stackFallback(1024, pp.gpa);
var buf = std.ArrayList(u8).init(sf.get());
var buf = std.array_list.Managed(u8).init(sf.get());
defer buf.deinit();
try buf.print("'{s}' not found", .{filename});

2
src/Compilation.zig
View file

@ -6603,7 +6603,7 @@ pub fn tmpFilePath(comp: Compilation, ally: Allocator, suffix: []const u8) error
pub fn addTranslateCCArgs(
comp: *Compilation,
arena: Allocator,
argv: *std.ArrayList([]const u8),
argv: *std.array_list.Managed([]const u8),
ext: FileExt,
out_dep_path: ?[]const u8,
owner_mod: *Package.Module,

2
src/main.zig
View file

@ -4554,7 +4554,7 @@ fn cmdTranslateC(
break :blk out_dep_path;
};
var argv = std.ArrayList([]const u8).init(arena);
var argv = std.array_list.Managed([]const u8).init(arena);
try comp.addTranslateCCArgs(arena, &argv, ext, out_dep_path, comp.root_mod);
try argv.append(c_source_file.src_path);
if (comp.verbose_cc) Compilation.dump_argv(argv.items);