std.ArrayList: make unmanaged the default

14 files changed, 55 insertions, 57 deletions

diff --git a/tools/docgen.zig b/tools/docgen.zig
index b007d27033..04066eff78 100644
--- a/tools/docgen.zig
+++ b/tools/docgen.zig
@@ -344,12 +344,12 @@ fn genToc(allocator: Allocator, tokenizer: *Tokenizer) !Toc {
     var last_action: Action = .open;
     var last_columns: ?u8 = null;
 
-    var toc_buf = std.ArrayList(u8).init(allocator);
+    var toc_buf = std.array_list.Managed(u8).init(allocator);
     defer toc_buf.deinit();
 
     var toc = toc_buf.writer();
 
-    var nodes = std.ArrayList(Node).init(allocator);
+    var nodes = std.array_list.Managed(Node).init(allocator);
     defer nodes.deinit();
 
     try toc.writeByte('\n');
@@ -449,7 +449,7 @@ fn genToc(allocator: Allocator, tokenizer: *Tokenizer) !Toc {
                         last_action = .close;
                     }
                 } else if (mem.eql(u8, tag_name, "see_also")) {
-                    var list = std.ArrayList(SeeAlsoItem).init(allocator);
+                    var list = std.array_list.Managed(SeeAlsoItem).init(allocator);
                     errdefer list.deinit();
 
                     while (true) {
@@ -599,7 +599,7 @@ fn genToc(allocator: Allocator, tokenizer: *Tokenizer) !Toc {
 }
 
 fn urlize(allocator: Allocator, input: []const u8) ![]u8 {
-    var buf = std.ArrayList(u8).init(allocator);
+    var buf = std.array_list.Managed(u8).init(allocator);
     defer buf.deinit();
 
     const out = buf.writer();
@@ -618,7 +618,7 @@ fn urlize(allocator: Allocator, input: []const u8) ![]u8 {
 }
 
 fn escapeHtml(allocator: Allocator, input: []const u8) ![]u8 {
-    var buf = std.ArrayList(u8).init(allocator);
+    var buf = std.array_list.Managed(u8).init(allocator);
     defer buf.deinit();
 
     const out = buf.writer();
diff --git a/tools/doctest.zig b/tools/doctest.zig
index 3fe0bb4708..a762b8d0b9 100644
--- a/tools/doctest.zig
+++ b/tools/doctest.zig
@@ -126,7 +126,7 @@ fn printOutput(
     const obj_ext = builtin.object_format.fileExt(builtin.cpu.arch);
     const print = std.debug.print;
 
-    var shell_buffer = std.ArrayList(u8).init(arena);
+    var shell_buffer = std.array_list.Managed(u8).init(arena);
     defer shell_buffer.deinit();
     var shell_out = shell_buffer.writer();
 
@@ -134,7 +134,7 @@ fn printOutput(
 
     switch (code.id) {
         .exe => |expected_outcome| code_block: {
-            var build_args = std.ArrayList([]const u8).init(arena);
+            var build_args = std.array_list.Managed([]const u8).init(arena);
             defer build_args.deinit();
             try build_args.appendSlice(&[_][]const u8{
                 zig_exe,    "build-exe",
@@ -284,7 +284,7 @@ fn printOutput(
             try shell_out.writeAll("\n");
         },
         .@"test" => {
-            var test_args = std.ArrayList([]const u8).init(arena);
+            var test_args = std.array_list.Managed([]const u8).init(arena);
             defer test_args.deinit();
 
             try test_args.appendSlice(&[_][]const u8{
@@ -345,7 +345,7 @@ fn printOutput(
             try shell_out.print("\n{s}{s}\n", .{ escaped_stderr, escaped_stdout });
         },
         .test_error => |error_match| {
-            var test_args = std.ArrayList([]const u8).init(arena);
+            var test_args = std.array_list.Managed([]const u8).init(arena);
             defer test_args.deinit();
 
             try test_args.appendSlice(&[_][]const u8{
@@ -399,7 +399,7 @@ fn printOutput(
             try shell_out.print("\n{s}\n", .{colored_stderr});
         },
         .test_safety => |error_match| {
-            var test_args = std.ArrayList([]const u8).init(arena);
+            var test_args = std.array_list.Managed([]const u8).init(arena);
             defer test_args.deinit();
 
             try test_args.appendSlice(&[_][]const u8{
@@ -461,7 +461,7 @@ fn printOutput(
         },
         .obj => |maybe_error_match| {
             const name_plus_obj_ext = try std.fmt.allocPrint(arena, "{s}{s}", .{ code_name, obj_ext });
-            var build_args = std.ArrayList([]const u8).init(arena);
+            var build_args = std.array_list.Managed([]const u8).init(arena);
             defer build_args.deinit();
 
             try build_args.appendSlice(&[_][]const u8{
@@ -543,7 +543,7 @@ fn printOutput(
                 .output_mode = .Lib,
             });
 
-            var test_args = std.ArrayList([]const u8).init(arena);
+            var test_args = std.array_list.Managed([]const u8).init(arena);
             defer test_args.deinit();
 
             try test_args.appendSlice(&[_][]const u8{
@@ -975,7 +975,7 @@ fn skipPrefix(line: []const u8) []const u8 {
 }
 
 fn escapeHtml(allocator: Allocator, input: []const u8) ![]u8 {
-    var buf = std.ArrayList(u8).init(allocator);
+    var buf = std.array_list.Managed(u8).init(allocator);
     defer buf.deinit();
 
     const out = buf.writer();
@@ -1011,7 +1011,7 @@ fn termColor(allocator: Allocator, input: []const u8) ![]u8 {
     const supported_sgr_colors = [_]u8{ 31, 32, 36 };
     const supported_sgr_numbers = [_]u8{ 0, 1, 2 };
 
-    var buf = std.ArrayList(u8).init(allocator);
+    var buf = std.array_list.Managed(u8).init(allocator);
     defer buf.deinit();
 
     var out = buf.writer();
@@ -1401,7 +1401,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
@@ -1418,7 +1418,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
@@ -1432,7 +1432,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
@@ -1451,7 +1451,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
@@ -1472,7 +1472,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
@@ -1491,7 +1491,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
@@ -1514,7 +1514,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
@@ -1536,7 +1536,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
@@ -1553,7 +1553,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
@@ -1572,7 +1572,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
@@ -1587,7 +1587,7 @@ test "printShell" {
             \\</samp></pre></figure>
         ;
 
-        var buffer = std.ArrayList(u8).init(test_allocator);
+        var buffer = std.array_list.Managed(u8).init(test_allocator);
         defer buffer.deinit();
 
         try printShell(buffer.writer(), shell_out, false);
diff --git a/tools/fetch_them_macos_headers.zig b/tools/fetch_them_macos_headers.zig
index 44f3e7bb86..2537621e0b 100644
--- a/tools/fetch_them_macos_headers.zig
+++ b/tools/fetch_them_macos_headers.zig
@@ -73,7 +73,7 @@ pub fn main() anyerror!void {
 
     const args = try std.process.argsAlloc(allocator);
 
-    var argv = std.ArrayList([]const u8).init(allocator);
+    var argv = std.array_list.Managed([]const u8).init(allocator);
     var sysroot: ?[]const u8 = null;
 
     var args_iter = ArgsIterator{ .args = args[1..] };
@@ -145,7 +145,7 @@ fn fetchTarget(
         ver.minor,
     });
 
-    var cc_argv = std.ArrayList([]const u8).init(arena);
+    var cc_argv = std.array_list.Managed([]const u8).init(arena);
     try cc_argv.appendSlice(&[_][]const u8{
         "cc",
         "-arch",
diff --git a/tools/gen_macos_headers_c.zig b/tools/gen_macos_headers_c.zig
index a56194a9a8..f95023adb7 100644
--- a/tools/gen_macos_headers_c.zig
+++ b/tools/gen_macos_headers_c.zig
@@ -23,7 +23,7 @@ pub fn main() anyerror!void {
     const args = try std.process.argsAlloc(arena);
     if (args.len == 1) fatal("no command or option specified", .{});
 
-    var positionals = std.ArrayList([]const u8).init(arena);
+    var positionals = std.array_list.Managed([]const u8).init(arena);
 
     for (args[1..]) |arg| {
         if (std.mem.eql(u8, arg, "--help") or std.mem.eql(u8, arg, "-h")) {
@@ -35,7 +35,7 @@ pub fn main() anyerror!void {
 
     var dir = try std.fs.cwd().openDir(positionals.items[0], .{ .no_follow = true });
     defer dir.close();
-    var paths = std.ArrayList([]const u8).init(arena);
+    var paths = std.array_list.Managed([]const u8).init(arena);
     try findHeaders(arena, dir, "", &paths);
 
     const SortFn = struct {
@@ -66,7 +66,7 @@ fn findHeaders(
     arena: Allocator,
     dir: std.fs.Dir,
     prefix: []const u8,
-    paths: *std.ArrayList([]const u8),
+    paths: *std.array_list.Managed([]const u8),
 ) anyerror!void {
     var it = dir.iterate();
     while (try it.next()) |entry| {
diff --git a/tools/gen_outline_atomics.zig b/tools/gen_outline_atomics.zig
index bcd757978a..a4c56ed1a9 100644
--- a/tools/gen_outline_atomics.zig
+++ b/tools/gen_outline_atomics.zig
@@ -37,7 +37,7 @@ pub fn main() !void {
         \\
     );
 
-    var footer = std.ArrayList(u8).init(arena);
+    var footer = std.array_list.Managed(u8).init(arena);
     try footer.appendSlice("\ncomptime {\n");
 
     for ([_]N{ .one, .two, .four, .eight, .sixteen }) |n| {
diff --git a/tools/gen_spirv_spec.zig b/tools/gen_spirv_spec.zig
index 6295285a4b..d2be3bde16 100644
--- a/tools/gen_spirv_spec.zig
+++ b/tools/gen_spirv_spec.zig
@@ -69,7 +69,7 @@ pub fn main() !void {
     const core_spec = try readRegistry(CoreRegistry, dir, "spirv.core.grammar.json");
     std.mem.sortUnstable(Instruction, core_spec.instructions, CmpInst{}, CmpInst.lt);
 
-    var exts = std.ArrayList(Extension).init(allocator);
+    var exts = std.array_list.Managed(Extension).init(allocator);
 
     var it = dir.iterate();
     while (try it.next()) |entry| {
@@ -113,7 +113,7 @@ pub fn main() !void {
     _ = try std.fs.File.stdout().write(formatted_output);
 }
 
-fn readExtRegistry(exts: *std.ArrayList(Extension), dir: std.fs.Dir, sub_path: []const u8) !void {
+fn readExtRegistry(exts: *std.array_list.Managed(Extension), dir: std.fs.Dir, sub_path: []const u8) !void {
     const filename = std.fs.path.basename(sub_path);
     if (!std.mem.startsWith(u8, filename, "extinst.")) {
         return;
@@ -296,8 +296,6 @@ fn render(
     );
 
     // Merge the operand kinds from all extensions together.
-    // var all_operand_kinds = std.ArrayList(OperandKind).init(a);
-    // try all_operand_kinds.appendSlice(registry.operand_kinds);
     var all_operand_kinds = OperandKindMap.init(allocator);
     for (registry.operand_kinds) |kind| {
         try all_operand_kinds.putNoClobber(.{ "core", kind.kind }, kind);
@@ -544,7 +542,7 @@ fn renderOpcodes(
     var inst_map = std.AutoArrayHashMap(u32, usize).init(allocator);
     try inst_map.ensureTotalCapacity(instructions.len);
 
-    var aliases = std.ArrayList(struct { inst: usize, alias: usize }).init(allocator);
+    var aliases = std.array_list.Managed(struct { inst: usize, alias: usize }).init(allocator);
     try aliases.ensureTotalCapacity(instructions.len);
 
     for (instructions, 0..) |inst, i| {
@@ -657,7 +655,7 @@ fn renderValueEnum(
     var enum_map = std.AutoArrayHashMap(u32, usize).init(allocator);
     try enum_map.ensureTotalCapacity(enumerants.len);
 
-    var aliases = std.ArrayList(struct { enumerant: usize, alias: usize }).init(allocator);
+    var aliases = std.array_list.Managed(struct { enumerant: usize, alias: usize }).init(allocator);
     try aliases.ensureTotalCapacity(enumerants.len);
 
     for (enumerants, 0..) |enumerant, i| {
@@ -735,7 +733,7 @@ fn renderBitEnum(
     var flags_by_bitpos = [_]?usize{null} ** 32;
     const enumerants = enumeration.enumerants orelse return error.InvalidRegistry;
 
-    var aliases = std.ArrayList(struct { flag: usize, alias: u5 }).init(allocator);
+    var aliases = std.array_list.Managed(struct { flag: usize, alias: u5 }).init(allocator);
     try aliases.ensureTotalCapacity(enumerants.len);
 
     for (enumerants, 0..) |enumerant, i| {
diff --git a/tools/generate_JSONTestSuite.zig b/tools/generate_JSONTestSuite.zig
index 56c6bc7261..1689c485e6 100644
--- a/tools/generate_JSONTestSuite.zig
+++ b/tools/generate_JSONTestSuite.zig
@@ -19,7 +19,7 @@ pub fn main() !void {
         \\
     );
 
-    var names = std.ArrayList([]const u8).init(allocator);
+    var names = std.array_list.Managed([]const u8).init(allocator);
     var cwd = try std.fs.cwd().openDir(".", .{ .iterate = true });
     var it = cwd.iterate();
     while (try it.next()) |entry| {
diff --git a/tools/generate_linux_syscalls.zig b/tools/generate_linux_syscalls.zig
index 9c60329f2b..60a5298477 100644
--- a/tools/generate_linux_syscalls.zig
+++ b/tools/generate_linux_syscalls.zig
@@ -591,7 +591,7 @@ fn generateSyscallsFromTable(
 
     const table = try linux_dir.readFile(arch_info.file_path, buf);
 
-    var optional_array_list: ?std.ArrayList(u8) = if (arch_info.additional_enum) |_| std.ArrayList(u8).init(allocator) else null;
+    var optional_array_list: ?std.array_list.Managed(u8) = if (arch_info.additional_enum) |_| std.array_list.Managed(u8).init(allocator) else null;
     const optional_writer = if (optional_array_list) |_| optional_array_list.?.writer() else null;
 
     try writer.print("pub const {s} = enum(usize) {{\n", .{arch_info.enum_name});
diff --git a/tools/migrate_langref.zig b/tools/migrate_langref.zig
index 95da6d5722..25f64e708c 100644
--- a/tools/migrate_langref.zig
+++ b/tools/migrate_langref.zig
@@ -319,13 +319,13 @@ fn walk(arena: Allocator, tokenizer: *Tokenizer, out_dir: std.fs.Dir, w: anytype
                     }
 
                     var mode: std.builtin.OptimizeMode = .Debug;
-                    var link_objects = std.ArrayList([]const u8).init(arena);
+                    var link_objects = std.array_list.Managed([]const u8).init(arena);
                     var target_str: ?[]const u8 = null;
                     var link_libc = false;
                     var link_mode: ?std.builtin.LinkMode = null;
                     var disable_cache = false;
                     var verbose_cimport = false;
-                    var additional_options = std.ArrayList([]const u8).init(arena);
+                    var additional_options = std.array_list.Managed([]const u8).init(arena);
 
                     const source_token = while (true) {
                         const content_tok = try eatToken(tokenizer, .content);
@@ -437,7 +437,7 @@ fn walk(arena: Allocator, tokenizer: *Tokenizer, out_dir: std.fs.Dir, w: anytype
 }
 
 fn urlize(allocator: Allocator, input: []const u8) ![]u8 {
-    var buf = std.ArrayList(u8).init(allocator);
+    var buf = std.array_list.Managed(u8).init(allocator);
     defer buf.deinit();
 
     const out = buf.writer();
diff --git a/tools/process_headers.zig b/tools/process_headers.zig
index 51d4436540..4a5a03516a 100644
--- a/tools/process_headers.zig
+++ b/tools/process_headers.zig
@@ -130,7 +130,7 @@ pub fn main() !void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     const allocator = arena.allocator();
     const args = try std.process.argsAlloc(allocator);
-    var search_paths = std.ArrayList([]const u8).init(allocator);
+    var search_paths = std.array_list.Managed([]const u8).init(allocator);
     var opt_out_dir: ?[]const u8 = null;
     var opt_abi: ?[]const u8 = null;
 
@@ -234,7 +234,7 @@ pub fn main() !void {
                 .musl => &[_][]const u8{ search_path, libc_dir, "usr", "local", "musl", "include" },
             };
             const target_include_dir = try std.fs.path.join(allocator, sub_path);
-            var dir_stack = std.ArrayList([]const u8).init(allocator);
+            var dir_stack = std.array_list.Managed([]const u8).init(allocator);
             try dir_stack.append(target_include_dir);
 
             while (dir_stack.pop()) |full_dir_name| {
@@ -323,7 +323,7 @@ pub fn main() !void {
     // gets their header in a separate arch directory.
     var path_it = path_table.iterator();
     while (path_it.next()) |path_kv| {
-        var contents_list = std.ArrayList(*Contents).init(allocator);
+        var contents_list = std.array_list.Managed(*Contents).init(allocator);
         {
             var hash_it = path_kv.value_ptr.*.iterator();
             while (hash_it.next()) |hash_kv| {
diff --git a/tools/update-linux-headers.zig b/tools/update-linux-headers.zig
index 3bf310e8e3..4938af0927 100644
--- a/tools/update-linux-headers.zig
+++ b/tools/update-linux-headers.zig
@@ -143,7 +143,7 @@ pub fn main() !void {
     var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     const arena = arena_state.allocator();
     const args = try std.process.argsAlloc(arena);
-    var search_paths = std.ArrayList([]const u8).init(arena);
+    var search_paths = std.array_list.Managed([]const u8).init(arena);
     var opt_out_dir: ?[]const u8 = null;
 
     var arg_i: usize = 1;
@@ -186,7 +186,7 @@ pub fn main() !void {
             const target_include_dir = try std.fs.path.join(arena, &.{
                 search_path, linux_target.name, "include",
             });
-            var dir_stack = std.ArrayList([]const u8).init(arena);
+            var dir_stack = std.array_list.Managed([]const u8).init(arena);
             try dir_stack.append(target_include_dir);
 
             while (dir_stack.pop()) |full_dir_name| {
@@ -261,7 +261,7 @@ pub fn main() !void {
     // gets their header in a separate arch directory.
     var path_it = path_table.iterator();
     while (path_it.next()) |path_kv| {
-        var contents_list = std.ArrayList(*Contents).init(arena);
+        var contents_list = std.array_list.Managed(*Contents).init(arena);
         {
             var hash_it = path_kv.value_ptr.*.iterator();
             while (hash_it.next()) |hash_kv| {
diff --git a/tools/update_clang_options.zig b/tools/update_clang_options.zig
index 95fc68fa55..3287a2d165 100644
--- a/tools/update_clang_options.zig
+++ b/tools/update_clang_options.zig
@@ -699,7 +699,7 @@ pub fn main() anyerror!void {
     defer parsed.deinit();
     const root_map = &parsed.value.object;
 
-    var all_objects = std.ArrayList(*json.ObjectMap).init(allocator);
+    var all_objects = std.array_list.Managed(*json.ObjectMap).init(allocator);
     {
         var it = root_map.iterator();
         it_map: while (it.next()) |kv| {
diff --git a/tools/update_cpu_features.zig b/tools/update_cpu_features.zig
index 8949db014d..f9bbe857f1 100644
--- a/tools/update_cpu_features.zig
+++ b/tools/update_cpu_features.zig
@@ -1634,8 +1634,8 @@ fn processOneTarget(job: Job) void {
     defer progress_node.end();
 
     var features_table = std.StringHashMap(Feature).init(arena);
-    var all_features = std.ArrayList(Feature).init(arena);
-    var all_cpus = std.ArrayList(Cpu).init(arena);
+    var all_features = std.array_list.Managed(Feature).init(arena);
+    var all_cpus = std.array_list.Managed(Cpu).init(arena);
 
     if (target.llvm) |llvm| {
         const tblgen_progress = progress_node.start("running llvm-tblgen", 0);
@@ -1726,7 +1726,7 @@ fn processOneTarget(job: Job) void {
 
                     var zig_name = try llvmNameToZigName(arena, llvm_name);
                     var desc = kv.value_ptr.object.get("Desc").?.string;
-                    var deps = std.ArrayList([]const u8).init(arena);
+                    var deps = std.array_list.Managed([]const u8).init(arena);
                     var omit = false;
                     var flatten = false;
                     var omit_deps: []const []const u8 = &.{};
@@ -1810,7 +1810,7 @@ fn processOneTarget(job: Job) void {
                     if (omitted) continue;
 
                     var zig_name = try llvmNameToZigName(arena, llvm_name);
-                    var deps = std.ArrayList([]const u8).init(arena);
+                    var deps = std.array_list.Managed([]const u8).init(arena);
                     var omit_deps: []const []const u8 = &.{};
                     var extra_deps: []const []const u8 = &.{};
                     for (target.feature_overrides) |feature_override| {
@@ -1979,7 +1979,7 @@ fn processOneTarget(job: Job) void {
             try putDep(&deps_set, features_table, dep);
         }
         try pruneFeatures(arena, features_table, &deps_set);
-        var dependencies = std.ArrayList([]const u8).init(arena);
+        var dependencies = std.array_list.Managed([]const u8).init(arena);
         {
             var it = deps_set.keyIterator();
             while (it.next()) |key| {
@@ -2024,7 +2024,7 @@ fn processOneTarget(job: Job) void {
             try putDep(&deps_set, features_table, feature_zig_name);
         }
         try pruneFeatures(arena, features_table, &deps_set);
-        var cpu_features = std.ArrayList([]const u8).init(arena);
+        var cpu_features = std.array_list.Managed([]const u8).init(arena);
         {
             var it = deps_set.keyIterator();
             while (it.next()) |key| {
diff --git a/tools/update_crc_catalog.zig b/tools/update_crc_catalog.zig
index f595c9c68e..8c226b06db 100644
--- a/tools/update_crc_catalog.zig
+++ b/tools/update_crc_catalog.zig
@@ -139,7 +139,7 @@ pub fn main() anyerror!void {
         _ = mem.replace(u8, snakecase, "-", "_", snakecase);
         _ = mem.replace(u8, snakecase, "/", "_", snakecase);
 
-        var buf = try std.ArrayList(u8).initCapacity(arena, snakecase.len);
+        var buf = try std.array_list.Managed(u8).initCapacity(arena, snakecase.len);
         defer buf.deinit();
 
         var prev: u8 = 0;