authorgravatar for seda18@rolmail.netDavid Senoner <seda18@rolmail.net> 2026-05-26 15:41:02+02:00
committergravatar for seda18@rolmail.netDavid Senoner <seda18@rolmail.net> 2026-06-10 16:14:53+02:00
logd23e22c4161ad2a005ad4ee54877cc6908424d54
tree6b7fed476cef8aac02889df1305c3a0f67da2eb3
parent09bb2315e22c50a4aa9900102fcbde0302717110
signaturelock-open Commit is signed but in an unrecognized format.

Replace usages of `StringArrayHashMapUnmanaged` with `array_hash_map.String`

36 files changed, 74 insertions(+), 74 deletions(-)

lib/compiler/Maker.zig+1-1
......@@ -481,7 +481,7 @@ pub fn main(init: process.Init.Minimal) !void {
481481 // maker process fails or crashes and it's helpful to be able to repeat
482482 // execution of the command line or otherwise inspect the configuration file.
483483 const c = &configuration;
484 var top_level_steps: std.StringArrayHashMapUnmanaged(Configuration.Step.Index) = .empty;
484 var top_level_steps: std.array_hash_map.String(Configuration.Step.Index) = .empty;
485485 for (configuration.steps, 0..) |*conf_step, step_index_usize| {
486486 if (conf_step.owner != .root) continue;
487487 const step_index: Configuration.Step.Index = @enumFromInt(step_index_usize);
lib/compiler/Maker/ScannedConfig.zig+1-1
......@@ -8,7 +8,7 @@ const Serializer = std.zon.Serializer;
88const Graph = @import("Graph.zig");
99
1010configuration: Configuration,
11top_level_steps: std.StringArrayHashMapUnmanaged(Configuration.Step.Index),
11top_level_steps: std.array_hash_map.String(Configuration.Step.Index),
1212path: []const u8,
1313
1414pub fn print(sc: *const ScannedConfig, w: *Writer) Writer.Error!void {
lib/compiler/Maker/Step/Compile.zig+1-1
......@@ -1127,7 +1127,7 @@ fn moduleNeedsCliArg(mod: *const Configuration.Module, conf: *const Configuratio
11271127
11281128const CliNamedModules = struct {
11291129 modules: std.AutoArrayHashMapUnmanaged(Configuration.Module.Index, void),
1130 names: std.StringArrayHashMapUnmanaged(void),
1130 names: std.array_hash_map.String(void),
11311131
11321132 /// Traverse the whole dependency graph and give every module a unique
11331133 /// name, ideally one named after what it's called somewhere in the graph.
lib/compiler/Maker/Watch.zig+1-1
......@@ -30,7 +30,7 @@ pub const have_impl = Os != void;
3030const DirTable = std.ArrayHashMapUnmanaged(Cache.Path, void, Cache.Path.TableAdapter, false);
3131
3232/// Special key of "." means any changes in this directory trigger the steps.
33const ReactionSet = std.StringArrayHashMapUnmanaged(StepSet);
33const ReactionSet = std.array_hash_map.String(StepSet);
3434const StepSet = std.AutoArrayHashMapUnmanaged(Configuration.Step.Index, Generation);
3535
3636const Generation = u8;
lib/compiler/aro/aro/Compilation.zig+2-2
......@@ -140,7 +140,7 @@ io: Io,
140140cwd: std.Io.Dir,
141141diagnostics: *Diagnostics,
142142
143sources: std.StringArrayHashMapUnmanaged(Source) = .empty,
143sources: std.array_hash_map.String(Source) = .empty,
144144source_aliases: std.ArrayList(Source) = .empty,
145145/// Allocated into `gpa`, but keys are externally managed.
146146search_path: std.ArrayList(Include) = .empty,
......@@ -159,7 +159,7 @@ builtins: Builtins = .{},
159159string_interner: StringInterner = .{},
160160interner: Interner = .{},
161161type_store: TypeStore = .{},
162pragma_handlers: std.StringArrayHashMapUnmanaged(*Pragma) = .empty,
162pragma_handlers: std.array_hash_map.String(*Pragma) = .empty,
163163/// If this is not null, the directory containing the specified Source will be searched for includes
164164/// Used by MS extensions which allow searching for includes relative to the directory of the main source file.
165165ms_cwd_source_id: ?Source.Id = null,
lib/compiler/aro/aro/DepFile.zig+1-1
......@@ -6,7 +6,7 @@ pub const Format = enum { make, nmake };
66const DepFile = @This();
77
88target: []const u8,
9deps: std.StringArrayHashMapUnmanaged(void) = .empty,
9deps: std.array_hash_map.String(void) = .empty,
1010format: Format,
1111
1212pub fn deinit(d: *DepFile, gpa: Allocator) void {
lib/compiler/aro/aro/Preprocessor.zig+1-1
......@@ -23,7 +23,7 @@ const Tree = @import("Tree.zig");
2323const Token = Tree.Token;
2424const TokenWithExpansionLocs = Tree.TokenWithExpansionLocs;
2525
26const DefineMap = std.StringArrayHashMapUnmanaged(Macro);
26const DefineMap = std.array_hash_map.String(Macro);
2727const RawTokenList = std.ArrayList(RawToken);
2828const max_include_depth = 200;
2929
lib/compiler/aro/aro/StringInterner.zig+1-1
......@@ -19,7 +19,7 @@ pub const StringId = enum(u32) {
1919 }
2020};
2121
22table: std.StringArrayHashMapUnmanaged(void) = .empty,
22table: std.array_hash_map.String(void) = .empty,
2323
2424pub fn deinit(si: *StringInterner, allocator: mem.Allocator) void {
2525 si.table.deinit(allocator);
lib/compiler/aro/backend/Ir.zig+3-3
......@@ -7,7 +7,7 @@ const Object = @import("Object.zig");
77const Ir = @This();
88
99interner: *Interner,
10decls: std.StringArrayHashMapUnmanaged(Decl),
10decls: std.array_hash_map.String(Decl),
1111
1212pub const Decl = struct {
1313 instructions: std.MultiArrayList(Inst),
......@@ -26,7 +26,7 @@ pub const Builder = struct {
2626 arena: std.heap.ArenaAllocator,
2727 interner: *Interner,
2828
29 decls: std.StringArrayHashMapUnmanaged(Decl) = .empty,
29 decls: std.array_hash_map.String(Decl) = .empty,
3030 instructions: std.MultiArrayList(Ir.Inst) = .empty,
3131 body: std.ArrayList(Ref) = .empty,
3232 alloc_count: u32 = 0,
......@@ -181,7 +181,7 @@ pub const Renderer = struct {
181181 ir: *const Ir,
182182 errors: ErrorList = .{},
183183
184 pub const ErrorList = std.StringArrayHashMapUnmanaged([]const u8);
184 pub const ErrorList = std.array_hash_map.String([]const u8);
185185
186186 pub const Error = Allocator.Error || error{LowerFail};
187187
lib/compiler/reduce/Walk.zig+2-2
......@@ -44,7 +44,7 @@ pub const Transformation = union(enum) {
4444 imported_string: []const u8,
4545 /// Identifier names that must be renamed in the inlined code or else
4646 /// will cause ambiguous reference errors.
47 in_scope_names: std.StringArrayHashMapUnmanaged(void),
47 in_scope_names: std.array_hash_map.String(void),
4848 };
4949};
5050
......@@ -723,7 +723,7 @@ fn walkBuiltinCall(
723723 try w.transformations.append(.{ .inline_imported_file = .{
724724 .builtin_call_node = call_node,
725725 .imported_string = imported_string,
726 .in_scope_names = try std.StringArrayHashMapUnmanaged(void).init(
726 .in_scope_names = try std.array_hash_map.String(void).init(
727727 w.arena,
728728 w.in_scope_names.keys(),
729729 &.{},
lib/compiler/resinator/cli.zig+1-1
......@@ -159,7 +159,7 @@ pub const Options = struct {
159159 default_language_id: ?u16 = null,
160160 default_code_page: ?SupportedCodePage = null,
161161 verbose: bool = false,
162 symbols: std.StringArrayHashMapUnmanaged(SymbolValue) = .empty,
162 symbols: std.array_hash_map.String(SymbolValue) = .empty,
163163 null_terminate_string_table_strings: bool = false,
164164 max_string_literal_codepoints: u15 = lex.default_max_string_literal_codepoints,
165165 silent_duplicate_control_ids: bool = false,
lib/compiler/resinator/cvtres.zig+1-1
......@@ -441,7 +441,7 @@ pub const ResourceDataEntry = extern struct {
441441const ResourceTree = struct {
442442 type_to_name_map: std.ArrayHashMapUnmanaged(NameOrOrdinal, NameToLanguageMap, NameOrOrdinalHashContext, true),
443443 rsrc_string_table: std.ArrayHashMapUnmanaged(NameOrOrdinal, void, NameOrOrdinalHashContext, true),
444 deduplicated_data: std.StringArrayHashMapUnmanaged(u32),
444 deduplicated_data: std.array_hash_map.String(u32),
445445 data_offsets: std.ArrayList(u32),
446446 rsrc02_len: u32,
447447 coff_options: CoffOptions,
lib/compiler/translate-c/Scope.zig+4-4
......@@ -7,7 +7,7 @@ const Translator = @import("Translator.zig");
77
88const Scope = @This();
99
10pub const SymbolTable = std.StringArrayHashMapUnmanaged(ast.Node);
10pub const SymbolTable = std.array_hash_map.String(ast.Node);
1111pub const AliasList = std.ArrayList(struct {
1212 alias: []const u8,
1313 name: []const u8,
......@@ -79,7 +79,7 @@ pub const Block = struct {
7979 /// will be used. This maps the variable's name to the Discard payload, so that if
8080 /// the variable is subsequently referenced we can indicate that the discard should
8181 /// be skipped during the intermediate AST -> Zig AST render step.
82 variable_discards: std.StringArrayHashMapUnmanaged(*ast.Payload.Discard),
82 variable_discards: std.array_hash_map.String(*ast.Payload.Discard),
8383
8484 /// When the block corresponds to a function, keep track of the return type
8585 /// so that the return expression can be cast, if necessary
......@@ -209,7 +209,7 @@ pub const Root = struct {
209209 base: Scope,
210210 translator: *Translator,
211211 sym_table: SymbolTable,
212 blank_macros: std.StringArrayHashMapUnmanaged(void),
212 blank_macros: std.array_hash_map.String(void),
213213 nodes: std.ArrayList(ast.Node),
214214 container_member_fns_map: ContainerMemberFnsHashMap,
215215
......@@ -267,7 +267,7 @@ pub const Root = struct {
267267 const gpa = root.translator.gpa;
268268 const arena = root.translator.arena;
269269
270 var member_names: std.StringArrayHashMapUnmanaged(void) = .empty;
270 var member_names: std.array_hash_map.String(void) = .empty;
271271 defer member_names.deinit(gpa);
272272 for (root.container_member_fns_map.keys(), root.container_member_fns_map.values()) |container_qt, members| {
273273 // Get the container name
lib/compiler/translate-c/Translator.zig+3-3
......@@ -123,7 +123,7 @@ anonymous_record_field_names: std.HashMapUnmanaged(
123123/// a list of names that we found by visiting all the top level decls without
124124/// translating them. The other maps are updated as we translate; this one is updated
125125/// up front in a pre-processing step.
126global_names: std.StringArrayHashMapUnmanaged(void) = .empty,
126global_names: std.array_hash_map.String(void) = .empty,
127127
128128/// This is similar to `global_names`, but contains names which we would
129129/// *like* to use, but do not strictly *have* to if they are unavailable.
......@@ -132,11 +132,11 @@ global_names: std.StringArrayHashMapUnmanaged(void) = .empty,
132132/// may be mangled.
133133/// This is distinct from `global_names` so we can detect at a type
134134/// declaration whether or not the name is available.
135weak_global_names: std.StringArrayHashMapUnmanaged(void) = .empty,
135weak_global_names: std.array_hash_map.String(void) = .empty,
136136
137137/// Set of identifiers known to refer to typedef declarations.
138138/// Used when parsing macros.
139typedefs: std.StringArrayHashMapUnmanaged(void) = .empty,
139typedefs: std.array_hash_map.String(void) = .empty,
140140
141141/// The lhs lval of a compound assignment expression.
142142compound_assign_dummy: ?ZigNode = null,
lib/docs/wasm/Walk.zig+4-4
......@@ -10,9 +10,9 @@ const Oom = error{OutOfMemory};
1010
1111pub const Decl = @import("Decl.zig");
1212
13pub var files: std.StringArrayHashMapUnmanaged(File) = .empty;
13pub var files: std.array_hash_map.String(File) = .empty;
1414pub var decls: std.ArrayList(Decl) = .empty;
15pub var modules: std.StringArrayHashMapUnmanaged(File.Index) = .empty;
15pub var modules: std.array_hash_map.String(File.Index) = .empty;
1616
1717file: File.Index,
1818
......@@ -465,8 +465,8 @@ pub const Scope = struct {
465465 const Namespace = struct {
466466 base: Scope = .{ .tag = .namespace },
467467 parent: *Scope,
468 names: std.StringArrayHashMapUnmanaged(Ast.Node.Index) = .empty,
469 doctests: std.StringArrayHashMapUnmanaged(Ast.Node.Index) = .empty,
468 names: std.array_hash_map.String(Ast.Node.Index) = .empty,
469 doctests: std.array_hash_map.String(Ast.Node.Index) = .empty,
470470 decl_index: Decl.Index,
471471 };
472472
lib/docs/wasm/main.zig+4-4
......@@ -264,7 +264,7 @@ const ErrorIdentifier = packed struct(u64) {
264264};
265265
266266var string_result: ArrayList(u8) = .empty;
267var error_set_result: std.StringArrayHashMapUnmanaged(ErrorIdentifier) = .empty;
267var error_set_result: std.array_hash_map.String(ErrorIdentifier) = .empty;
268268
269269export fn decl_error_set(decl_index: Decl.Index) Slice(ErrorIdentifier) {
270270 return Slice(ErrorIdentifier).init(decl_error_set_fallible(decl_index) catch @panic("OOM"));
......@@ -305,7 +305,7 @@ fn sort_error_set_result() void {
305305
306306fn addErrorsFromDecl(
307307 decl_index: Decl.Index,
308 out: *std.StringArrayHashMapUnmanaged(ErrorIdentifier),
308 out: *std.array_hash_map.String(ErrorIdentifier),
309309) Oom!void {
310310 switch (decl_index.get().categorize()) {
311311 .error_set => |node| try addErrorsFromExpr(decl_index, out, node),
......@@ -316,7 +316,7 @@ fn addErrorsFromDecl(
316316
317317fn addErrorsFromExpr(
318318 decl_index: Decl.Index,
319 out: *std.StringArrayHashMapUnmanaged(ErrorIdentifier),
319 out: *std.array_hash_map.String(ErrorIdentifier),
320320 node: Ast.Node.Index,
321321) Oom!void {
322322 const decl = decl_index.get();
......@@ -343,7 +343,7 @@ fn addErrorsFromExpr(
343343
344344fn addErrorsFromNode(
345345 decl_index: Decl.Index,
346 out: *std.StringArrayHashMapUnmanaged(ErrorIdentifier),
346 out: *std.array_hash_map.String(ErrorIdentifier),
347347 node: Ast.Node.Index,
348348) Oom!void {
349349 const decl = decl_index.get();
lib/std/Build.zig+3-3
......@@ -33,7 +33,7 @@ user_input_options: UserInputOptionsMap,
3333available_options_map: std.array_hash_map.String(AvailableOption) = .empty,
3434invalid_user_input: bool,
3535default_step: *Step,
36top_level_steps: std.StringArrayHashMapUnmanaged(*Step.TopLevel),
36top_level_steps: std.array_hash_map.String(*Step.TopLevel),
3737/// Path to the directory containing build.zig.
3838root: Cache.Path,
3939debug_log_scopes: []const []const u8 = &.{},
......@@ -78,11 +78,11 @@ pub const Graph = struct {
7878 io: Io,
7979 /// Process lifetime.
8080 arena: Allocator,
81 system_integration_options: std.StringArrayHashMapUnmanaged(SystemLibraryMode) = .empty,
81 system_integration_options: std.array_hash_map.String(SystemLibraryMode) = .empty,
8282 system_package_mode: bool = false,
8383 zig_exe: []const u8,
8484 environ_map: process.Environ.Map,
85 needed_lazy_dependencies: std.StringArrayHashMapUnmanaged(void) = .empty,
85 needed_lazy_dependencies: std.array_hash_map.String(void) = .empty,
8686 /// Information about the native target. Computed before build() is invoked.
8787 host: ResolvedTarget,
8888 dependency_cache: InitializedDepMap = .empty,
lib/std/Build/Module.zig+2-2
......@@ -12,7 +12,7 @@ root_source_file: ?LazyPath,
1212/// The modules that are mapped into this module's import table.
1313/// Use `addImport` rather than modifying this field directly in order to
1414/// maintain step dependency edges.
15import_table: std.StringArrayHashMapUnmanaged(*Module),
15import_table: std.array_hash_map.String(*Module),
1616
1717resolved_target: ?std.Build.ResolvedTarget = null,
1818optimize: ?std.builtin.OptimizeMode = null,
......@@ -22,7 +22,7 @@ c_macros: ArrayList([]const u8),
2222include_dirs: ArrayList(IncludeDir),
2323lib_paths: ArrayList(LazyPath),
2424rpaths: ArrayList(RPath),
25frameworks: std.StringArrayHashMapUnmanaged(LinkFrameworkOptions),
25frameworks: std.array_hash_map.String(LinkFrameworkOptions),
2626link_objects: ArrayList(LinkObject),
2727
2828strip: ?bool,
lib/std/Build/Step/Compile.zig+1-1
......@@ -187,7 +187,7 @@ entry: Entry = .default,
187187/// List of symbols forced as undefined in the symbol table
188188/// thus forcing their resolution by the linker.
189189/// Corresponds to `-u <symbol>` for ELF/MachO and `/include:<symbol>` for COFF/PE.
190force_undefined_symbols: std.StringArrayHashMapUnmanaged(void),
190force_undefined_symbols: std.array_hash_map.String(void),
191191
192192/// Overrides the default stack size
193193stack_size: ?u64 = null,
lib/std/debug/MachOFile.zig+2-2
......@@ -115,7 +115,7 @@ pub fn load(gpa: Allocator, io: Io, path: []const u8, arch: std.Target.Cpu.Arch)
115115 // necessary because we prefer to use STAB ("symbolic debugging table") symbols,
116116 // but they might not be present, so we track normal symbols too.
117117 // Indices match 1-1 with those of `symbols`.
118 var symbol_names: std.StringArrayHashMapUnmanaged(void) = .empty;
118 var symbol_names: std.array_hash_map.String(void) = .empty;
119119 defer symbol_names.deinit(gpa);
120120 try symbol_names.ensureUnusedCapacity(gpa, symtab.nsyms);
121121
......@@ -380,7 +380,7 @@ test {
380380
381381fn appendStabSymbol(
382382 symbols: *std.ArrayList(Symbol),
383 symbol_names: *std.StringArrayHashMapUnmanaged(void),
383 symbol_names: *std.array_hash_map.String(void),
384384 strings: []const u8,
385385 last_sym: Symbol,
386386) void {
lib/std/json/hashmap.zig+4-4
......@@ -6,20 +6,20 @@ const innerParse = @import("static.zig").innerParse;
66const innerParseFromValue = @import("static.zig").innerParseFromValue;
77const Value = @import("dynamic.zig").Value;
88
9/// A thin wrapper around `std.StringArrayHashMapUnmanaged` that implements
9/// A thin wrapper around `std.array_hash_map.String` that implements
1010/// `jsonParse`, `jsonParseFromValue`, and `jsonStringify`.
1111/// This is useful when your JSON schema has an object with arbitrary data keys
1212/// instead of comptime-known struct field names.
1313pub fn ArrayHashMap(comptime T: type) type {
1414 return struct {
15 map: std.StringArrayHashMapUnmanaged(T) = .empty,
15 map: std.array_hash_map.String(T) = .empty,
1616
1717 pub fn deinit(self: *@This(), allocator: Allocator) void {
1818 self.map.deinit(allocator);
1919 }
2020
2121 pub fn jsonParse(allocator: Allocator, source: anytype, options: ParseOptions) !@This() {
22 var map: std.StringArrayHashMapUnmanaged(T) = .empty;
22 var map: std.array_hash_map.String(T) = .empty;
2323 errdefer map.deinit(allocator);
2424
2525 if (.object_begin != try source.next()) return error.UnexpectedToken;
......@@ -52,7 +52,7 @@ pub fn ArrayHashMap(comptime T: type) type {
5252 pub fn jsonParseFromValue(allocator: Allocator, source: Value, options: ParseOptions) !@This() {
5353 if (source != .object) return error.UnexpectedToken;
5454
55 var map: std.StringArrayHashMapUnmanaged(T) = .empty;
55 var map: std.array_hash_map.String(T) = .empty;
5656 errdefer map.deinit(allocator);
5757
5858 var it = source.object.iterator();
lib/std/process/Preopens.zig+1-1
......@@ -16,7 +16,7 @@ pub const empty: Preopens = switch (native_os) {
1616
1717pub const Map = switch (native_os) {
1818 // Indexed by file descriptor number.
19 .wasi => std.StringArrayHashMapUnmanaged(void),
19 .wasi => std.array_hash_map.String(void),
2020 else => void,
2121};
2222
lib/std/zig/Ast/Render.zig+1-1
......@@ -42,7 +42,7 @@ pub const Fixups = struct {
4242 /// These nodes will be replaced with a different node.
4343 replace_nodes_with_node: std.AutoHashMapUnmanaged(Ast.Node.Index, Ast.Node.Index) = .empty,
4444 /// Change all identifier names matching the key to be value instead.
45 rename_identifiers: std.StringArrayHashMapUnmanaged([]const u8) = .empty,
45 rename_identifiers: std.array_hash_map.String([]const u8) = .empty,
4646
4747 /// All `@import` builtin calls which refer to a file path will be prefixed
4848 /// with this path.
src/Compilation.zig+4-4
......@@ -87,7 +87,7 @@ link_inputs: []const link.Input,
8787framework_dirs: []const []const u8,
8888/// These are only for DLLs dependencies fulfilled by the `.def` files shipped
8989/// with Zig. Static libraries are provided as `link.Input` values.
90windows_libs: std.StringArrayHashMapUnmanaged(void),
90windows_libs: std.array_hash_map.String(void),
9191/// The number of items in `windows_libs` which we have already built. All items at or after this
9292/// index will be built in `performAllTheWork`.
9393windows_libs_num_done: u32,
......@@ -101,7 +101,7 @@ native_system_include_paths: []const []const u8,
101101/// List of symbols forced as undefined in the symbol table
102102/// thus forcing their resolution by the linker.
103103/// Corresponds to `-u <symbol>` for ELF/MachO and `/include:<symbol>` for COFF/PE.
104force_undefined_symbols: std.StringArrayHashMapUnmanaged(void),
104force_undefined_symbols: std.array_hash_map.String(void),
105105
106106c_object_table: std.AutoArrayHashMapUnmanaged(*CObject, void) = .empty,
107107win32_resource_table: if (dev.env.supports(.win32_resource)) std.AutoArrayHashMapUnmanaged(*Win32Resource, void) else struct {
......@@ -1604,7 +1604,7 @@ pub const CreateOptions = struct {
16041604 /// implementations still do.
16051605 lib_directories: []const Cache.Directory = &.{},
16061606 rpath_list: []const []const u8 = &[0][]const u8{},
1607 symbol_wrap_set: std.StringArrayHashMapUnmanaged(void) = .empty,
1607 symbol_wrap_set: std.array_hash_map.String(void) = .empty,
16081608 c_source_files: []const CSourceFile = &.{},
16091609 rc_source_files: []const RcSourceFile = &.{},
16101610 manifest_file: ?[]const u8 = null,
......@@ -1683,7 +1683,7 @@ pub const CreateOptions = struct {
16831683 skip_linker_dependencies: bool = false,
16841684 hash_style: link.File.Lld.Elf.HashStyle = .both,
16851685 entry: Entry = .default,
1686 force_undefined_symbols: std.StringArrayHashMapUnmanaged(void) = .empty,
1686 force_undefined_symbols: std.array_hash_map.String(void) = .empty,
16871687 stack_size: ?u64 = null,
16881688 image_base: ?u64 = null,
16891689 version: ?std.SemanticVersion = null,
src/Package/Fetch.zig+2-2
......@@ -1725,7 +1725,7 @@ fn computeHash(f: *Fetch, pkg_path: Cache.Path, filter: Filter) RunError!Compute
17251725
17261726 // Track directories which had any files deleted from them so that empty directories
17271727 // can be deleted.
1728 var sus_dirs: std.StringArrayHashMapUnmanaged(void) = .empty;
1728 var sus_dirs: std.array_hash_map.String(void) = .empty;
17291729 defer sus_dirs.deinit(gpa);
17301730
17311731 var walker = try root_dir.walk(gpa);
......@@ -2002,7 +2002,7 @@ fn normalizePath(bytes: []u8) void {
20022002}
20032003
20042004const Filter = struct {
2005 include_paths: std.StringArrayHashMapUnmanaged(void) = .empty,
2005 include_paths: std.array_hash_map.String(void) = .empty,
20062006
20072007 /// sub_path is relative to the package root.
20082008 pub fn includePath(self: *const Filter, sub_path: []const u8) bool {
src/Package/Manifest.zig+4-4
......@@ -42,9 +42,9 @@ name: []const u8,
4242id: u32,
4343version: std.SemanticVersion,
4444version_node: Ast.Node.Index,
45dependencies: std.StringArrayHashMapUnmanaged(Dependency),
45dependencies: std.array_hash_map.String(Dependency),
4646dependencies_node: Ast.Node.OptionalIndex,
47paths: std.StringArrayHashMapUnmanaged(void),
47paths: std.array_hash_map.String(void),
4848minimum_zig_version: ?std.SemanticVersion,
4949
5050errors: []ErrorMessage,
......@@ -144,9 +144,9 @@ const Parse = struct {
144144 id: u32,
145145 version: std.SemanticVersion,
146146 version_node: Ast.Node.Index,
147 dependencies: std.StringArrayHashMapUnmanaged(Dependency),
147 dependencies: std.array_hash_map.String(Dependency),
148148 dependencies_node: Ast.Node.OptionalIndex,
149 paths: std.StringArrayHashMapUnmanaged(void),
149 paths: std.array_hash_map.String(void),
150150 allow_missing_paths_field: bool,
151151 minimum_zig_version: ?std.SemanticVersion,
152152
src/Package/Module.zig+1-1
......@@ -35,7 +35,7 @@ cc_argv: []const []const u8,
3535structured_cfg: bool,
3636no_builtin: bool,
3737
38pub const Deps = std.StringArrayHashMapUnmanaged(*Module);
38pub const Deps = std.array_hash_map.String(*Module);
3939
4040pub const Tree = struct {
4141 /// Each `Package` exposes a `Module` with build.zig as its root source file.
src/codegen/llvm/FuncGen.zig+1-1
......@@ -2513,7 +2513,7 @@ fn airAssembly(self: *FuncGen, inst: Air.Inst.Index) TodoError!Builder.Value {
25132513 var llvm_param_i: usize = 0;
25142514 var total_i: usize = 0;
25152515
2516 var name_map: std.StringArrayHashMapUnmanaged(u16) = .empty;
2516 var name_map: std.array_hash_map.String(u16) = .empty;
25172517 try name_map.ensureUnusedCapacity(arena, max_param_count);
25182518
25192519 var it = unwrapped_asm.iterateOutputs();
src/codegen/spirv/Assembler.zig+2-2
......@@ -35,8 +35,8 @@ inst: struct {
3535 return null;
3636 }
3737} = .{},
38value_map: std.StringArrayHashMapUnmanaged(AsmValue) = .{},
39inst_map: std.StringArrayHashMapUnmanaged(void) = .empty,
38value_map: std.array_hash_map.String(AsmValue) = .{},
39inst_map: std.array_hash_map.String(void) = .empty,
4040
4141const Operand = union(enum) {
4242 /// Any 'simple' 32-bit value. This could be a mask or
src/codegen/spirv/Module.zig+1-1
......@@ -66,7 +66,7 @@ cache: struct {
6666 extended_instruction_set: std.AutoHashMapUnmanaged(spec.InstructionSet, Id) = .empty,
6767 decorations: std.AutoHashMapUnmanaged(struct { Id, spec.Decoration }, void) = .empty,
6868 builtins: std.AutoHashMapUnmanaged(struct { spec.BuiltIn, spec.StorageClass }, Decl.Index) = .empty,
69 strings: std.StringArrayHashMapUnmanaged(Id) = .empty,
69 strings: std.array_hash_map.String(Id) = .empty,
7070
7171 bool_const: [2]?Id = .{ null, null },
7272 constants: std.ArrayHashMapUnmanaged(Constant, Id, Constant.HashContext, true) = .empty,
src/libs/mingw/implib.zig+1-1
......@@ -245,7 +245,7 @@ pub fn getMembers(
245245 };
246246 var renames: std.ArrayList(DeferredExport) = .empty;
247247 defer renames.deinit(allocator);
248 var regular_imports: std.StringArrayHashMapUnmanaged([]const u8) = .empty;
248 var regular_imports: std.array_hash_map.String([]const u8) = .empty;
249249 defer regular_imports.deinit(allocator);
250250
251251 for (module_def.exports.items) |*e| {
src/link.zig+1-1
......@@ -471,7 +471,7 @@ pub const File = struct {
471471 /// wrapper for a system function. The wrapper function should be called
472472 /// __wrap_symbol. If it wishes to call the system function, it should call
473473 /// __real_symbol.
474 symbol_wrap_set: std.StringArrayHashMapUnmanaged(void),
474 symbol_wrap_set: std.array_hash_map.String(void),
475475
476476 compatibility_version: ?std.SemanticVersion,
477477
src/link/Elf.zig+4-4
......@@ -2,7 +2,7 @@ pub const Atom = @import("Elf/Atom.zig");
22
33base: link.File,
44zig_object: ?*ZigObject,
5rpath_table: std.StringArrayHashMapUnmanaged(void),
5rpath_table: std.array_hash_map.String(void),
66image_base: u64,
77z_nodelete: bool,
88z_notext: bool,
......@@ -30,7 +30,7 @@ file_handles: std.ArrayList(File.Handle) = .empty,
3030zig_object_index: ?File.Index = null,
3131linker_defined_index: ?File.Index = null,
3232objects: std.ArrayList(File.Index) = .empty,
33shared_objects: std.StringArrayHashMapUnmanaged(File.Index) = .empty,
33shared_objects: std.array_hash_map.String(File.Index) = .empty,
3434
3535/// List of all output sections and their associated metadata.
3636sections: std.MultiArrayList(Section) = .{},
......@@ -249,7 +249,7 @@ pub fn createEmpty(
249249 const is_dyn_lib = output_mode == .Lib and link_mode == .dynamic;
250250 const default_sym_version: elf.Versym = if (is_dyn_lib or comp.config.rdynamic) .GLOBAL else .LOCAL;
251251
252 var rpath_table: std.StringArrayHashMapUnmanaged(void) = .empty;
252 var rpath_table: std.array_hash_map.String(void) = .empty;
253253 try rpath_table.entries.resize(arena, options.rpath_list.len);
254254 @memcpy(rpath_table.entries.items(.key), options.rpath_list);
255255 try rpath_table.reIndex(arena);
......@@ -1112,7 +1112,7 @@ fn parseDso(
11121112 io: Io,
11131113 diags: *Diags,
11141114 dso: link.Input.Dso,
1115 shared_objects: *std.StringArrayHashMapUnmanaged(File.Index),
1115 shared_objects: *std.array_hash_map.String(File.Index),
11161116 files: *std.MultiArrayList(File.Entry),
11171117 target: *const std.Target,
11181118) !void {
src/link/MachO/Dylib.zig+1-1
......@@ -14,7 +14,7 @@ symbols: std.ArrayList(Symbol) = .empty,
1414symbols_extra: std.ArrayList(u32) = .empty,
1515globals: std.ArrayList(MachO.SymbolResolver.Index) = .empty,
1616dependents: std.ArrayList(Id) = .empty,
17rpaths: std.StringArrayHashMapUnmanaged(void) = .empty,
17rpaths: std.array_hash_map.String(void) = .empty,
1818umbrella: File.Index,
1919platform: ?MachO.Platform = null,
2020
src/link/Wasm/Archive.zig+1-1
......@@ -12,7 +12,7 @@ toc: Toc,
1212
1313/// Key points into `LazyArchive` `file_contents`.
1414/// Value is allocated with gpa.
15const Toc = std.StringArrayHashMapUnmanaged(std.ArrayList(u32));
15const Toc = std.array_hash_map.String(std.ArrayList(u32));
1616
1717const ARMAG = std.elf.ARMAG;
1818const ARFMAG = std.elf.ARFMAG;
src/main.zig+6-6
......@@ -987,7 +987,7 @@ fn buildOutputType(
987987 var test_no_exec = false;
988988 var test_execve = false;
989989 var entry: Compilation.CreateOptions.Entry = .default;
990 var force_undefined_symbols: std.StringArrayHashMapUnmanaged(void) = .empty;
990 var force_undefined_symbols: std.array_hash_map.String(void) = .empty;
991991 var stack_size: ?u64 = null;
992992 var image_base: ?u64 = null;
993993 var link_eh_frame_hdr = false;
......@@ -1024,7 +1024,7 @@ fn buildOutputType(
10241024 // These are before resolving sysroot.
10251025 var extra_cflags: std.ArrayList([]const u8) = .empty;
10261026 var extra_rcflags: std.ArrayList([]const u8) = .empty;
1027 var symbol_wrap_set: std.StringArrayHashMapUnmanaged(void) = .empty;
1027 var symbol_wrap_set: std.array_hash_map.String(void) = .empty;
10281028 var rc_includes: std.zig.RcIncludes = .any;
10291029 var manifest_file: ?[]const u8 = null;
10301030 var linker_export_symbol_names: std.ArrayList([]const u8) = .empty;
......@@ -3592,7 +3592,7 @@ fn buildOutputType(
35923592 defer file_system_inputs.deinit(gpa);
35933593
35943594 // Deduplicate rpath entries
3595 var rpath_dedup = std.StringArrayHashMapUnmanaged(void){};
3595 var rpath_dedup = std.array_hash_map.String(void){};
35963596 for (create_module.rpath_list.items) |rpath| {
35973597 try rpath_dedup.put(arena, rpath, {});
35983598 }
......@@ -3896,7 +3896,7 @@ fn buildOutputType(
38963896
38973897const CreateModule = struct {
38983898 dirs: Compilation.Directories,
3899 modules: std.StringArrayHashMapUnmanaged(CliModule),
3899 modules: std.array_hash_map.String(CliModule),
39003900 opts: Compilation.Config.Options,
39013901 dynamic_linker: ?[]const u8,
39023902 object_format: ?[]const u8,
......@@ -3908,7 +3908,7 @@ const CreateModule = struct {
39083908 /// link_libcpp, and then the libraries are filtered into
39093909 /// `unresolved_link_inputs` and `windows_libs`.
39103910 cli_link_inputs: std.ArrayList(link.UnresolvedInput),
3911 windows_libs: std.StringArrayHashMapUnmanaged(void),
3911 windows_libs: std.array_hash_map.String(void),
39123912 /// The local variable `unresolved_link_inputs` is fed into library
39133913 /// resolution, mutating the input array, and producing this data as
39143914 /// output. Allocated with gpa.
......@@ -3926,7 +3926,7 @@ const CreateModule = struct {
39263926 lib_dir_args: std.ArrayList([]const u8),
39273927 libc_installation: ?LibCInstallation,
39283928 want_native_include_dirs: bool,
3929 frameworks: std.StringArrayHashMapUnmanaged(Framework),
3929 frameworks: std.array_hash_map.String(Framework),
39303930 native_system_include_paths: []const []const u8,
39313931 framework_dirs: std.ArrayList([]const u8),
39323932 rpath_list: std.ArrayList([]const u8),