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
signature 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 {...@@ -481,7 +481,7 @@ pub fn main(init: process.Init.Minimal) !void {
481 // maker process fails or crashes and it's helpful to be able to repeat481 // maker process fails or crashes and it's helpful to be able to repeat
482 // execution of the command line or otherwise inspect the configuration file.482 // execution of the command line or otherwise inspect the configuration file.
483 const c = &configuration;483 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;
485 for (configuration.steps, 0..) |*conf_step, step_index_usize| {485 for (configuration.steps, 0..) |*conf_step, step_index_usize| {
486 if (conf_step.owner != .root) continue;486 if (conf_step.owner != .root) continue;
487 const step_index: Configuration.Step.Index = @enumFromInt(step_index_usize);487 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;...@@ -8,7 +8,7 @@ const Serializer = std.zon.Serializer;
8const Graph = @import("Graph.zig");8const Graph = @import("Graph.zig");
99
10configuration: Configuration,10configuration: Configuration,
11top_level_steps: std.StringArrayHashMapUnmanaged(Configuration.Step.Index),11top_level_steps: std.array_hash_map.String(Configuration.Step.Index),
12path: []const u8,12path: []const u8,
1313
14pub fn print(sc: *const ScannedConfig, w: *Writer) Writer.Error!void {14pub 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...@@ -1127,7 +1127,7 @@ fn moduleNeedsCliArg(mod: *const Configuration.Module, conf: *const Configuratio
11271127
1128const CliNamedModules = struct {1128const CliNamedModules = struct {
1129 modules: std.AutoArrayHashMapUnmanaged(Configuration.Module.Index, void),1129 modules: std.AutoArrayHashMapUnmanaged(Configuration.Module.Index, void),
1130 names: std.StringArrayHashMapUnmanaged(void),1130 names: std.array_hash_map.String(void),
11311131
1132 /// Traverse the whole dependency graph and give every module a unique1132 /// Traverse the whole dependency graph and give every module a unique
1133 /// name, ideally one named after what it's called somewhere in the graph.1133 /// 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;...@@ -30,7 +30,7 @@ pub const have_impl = Os != void;
30const DirTable = std.ArrayHashMapUnmanaged(Cache.Path, void, Cache.Path.TableAdapter, false);30const DirTable = std.ArrayHashMapUnmanaged(Cache.Path, void, Cache.Path.TableAdapter, false);
3131
32/// Special key of "." means any changes in this directory trigger the steps.32/// 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);
34const StepSet = std.AutoArrayHashMapUnmanaged(Configuration.Step.Index, Generation);34const StepSet = std.AutoArrayHashMapUnmanaged(Configuration.Step.Index, Generation);
3535
36const Generation = u8;36const Generation = u8;
lib/compiler/aro/aro/Compilation.zig+2-2
...@@ -140,7 +140,7 @@ io: Io,...@@ -140,7 +140,7 @@ io: Io,
140cwd: std.Io.Dir,140cwd: std.Io.Dir,
141diagnostics: *Diagnostics,141diagnostics: *Diagnostics,
142142
143sources: std.StringArrayHashMapUnmanaged(Source) = .empty,143sources: std.array_hash_map.String(Source) = .empty,
144source_aliases: std.ArrayList(Source) = .empty,144source_aliases: std.ArrayList(Source) = .empty,
145/// Allocated into `gpa`, but keys are externally managed.145/// Allocated into `gpa`, but keys are externally managed.
146search_path: std.ArrayList(Include) = .empty,146search_path: std.ArrayList(Include) = .empty,
...@@ -159,7 +159,7 @@ builtins: Builtins = .{},...@@ -159,7 +159,7 @@ builtins: Builtins = .{},
159string_interner: StringInterner = .{},159string_interner: StringInterner = .{},
160interner: Interner = .{},160interner: Interner = .{},
161type_store: TypeStore = .{},161type_store: TypeStore = .{},
162pragma_handlers: std.StringArrayHashMapUnmanaged(*Pragma) = .empty,162pragma_handlers: std.array_hash_map.String(*Pragma) = .empty,
163/// If this is not null, the directory containing the specified Source will be searched for includes163/// If this is not null, the directory containing the specified Source will be searched for includes
164/// Used by MS extensions which allow searching for includes relative to the directory of the main source file.164/// Used by MS extensions which allow searching for includes relative to the directory of the main source file.
165ms_cwd_source_id: ?Source.Id = null,165ms_cwd_source_id: ?Source.Id = null,
lib/compiler/aro/aro/DepFile.zig+1-1
...@@ -6,7 +6,7 @@ pub const Format = enum { make, nmake };...@@ -6,7 +6,7 @@ pub const Format = enum { make, nmake };
6const DepFile = @This();6const DepFile = @This();
77
8target: []const u8,8target: []const u8,
9deps: std.StringArrayHashMapUnmanaged(void) = .empty,9deps: std.array_hash_map.String(void) = .empty,
10format: Format,10format: Format,
1111
12pub fn deinit(d: *DepFile, gpa: Allocator) void {12pub fn deinit(d: *DepFile, gpa: Allocator) void {
lib/compiler/aro/aro/Preprocessor.zig+1-1
...@@ -23,7 +23,7 @@ const Tree = @import("Tree.zig");...@@ -23,7 +23,7 @@ const Tree = @import("Tree.zig");
23const Token = Tree.Token;23const Token = Tree.Token;
24const TokenWithExpansionLocs = Tree.TokenWithExpansionLocs;24const TokenWithExpansionLocs = Tree.TokenWithExpansionLocs;
2525
26const DefineMap = std.StringArrayHashMapUnmanaged(Macro);26const DefineMap = std.array_hash_map.String(Macro);
27const RawTokenList = std.ArrayList(RawToken);27const RawTokenList = std.ArrayList(RawToken);
28const max_include_depth = 200;28const max_include_depth = 200;
2929
lib/compiler/aro/aro/StringInterner.zig+1-1
...@@ -19,7 +19,7 @@ pub const StringId = enum(u32) {...@@ -19,7 +19,7 @@ pub const StringId = enum(u32) {
19 }19 }
20};20};
2121
22table: std.StringArrayHashMapUnmanaged(void) = .empty,22table: std.array_hash_map.String(void) = .empty,
2323
24pub fn deinit(si: *StringInterner, allocator: mem.Allocator) void {24pub fn deinit(si: *StringInterner, allocator: mem.Allocator) void {
25 si.table.deinit(allocator);25 si.table.deinit(allocator);
lib/compiler/aro/backend/Ir.zig+3-3
...@@ -7,7 +7,7 @@ const Object = @import("Object.zig");...@@ -7,7 +7,7 @@ const Object = @import("Object.zig");
7const Ir = @This();7const Ir = @This();
88
9interner: *Interner,9interner: *Interner,
10decls: std.StringArrayHashMapUnmanaged(Decl),10decls: std.array_hash_map.String(Decl),
1111
12pub const Decl = struct {12pub const Decl = struct {
13 instructions: std.MultiArrayList(Inst),13 instructions: std.MultiArrayList(Inst),
...@@ -26,7 +26,7 @@ pub const Builder = struct {...@@ -26,7 +26,7 @@ pub const Builder = struct {
26 arena: std.heap.ArenaAllocator,26 arena: std.heap.ArenaAllocator,
27 interner: *Interner,27 interner: *Interner,
2828
29 decls: std.StringArrayHashMapUnmanaged(Decl) = .empty,29 decls: std.array_hash_map.String(Decl) = .empty,
30 instructions: std.MultiArrayList(Ir.Inst) = .empty,30 instructions: std.MultiArrayList(Ir.Inst) = .empty,
31 body: std.ArrayList(Ref) = .empty,31 body: std.ArrayList(Ref) = .empty,
32 alloc_count: u32 = 0,32 alloc_count: u32 = 0,
...@@ -181,7 +181,7 @@ pub const Renderer = struct {...@@ -181,7 +181,7 @@ pub const Renderer = struct {
181 ir: *const Ir,181 ir: *const Ir,
182 errors: ErrorList = .{},182 errors: ErrorList = .{},
183183
184 pub const ErrorList = std.StringArrayHashMapUnmanaged([]const u8);184 pub const ErrorList = std.array_hash_map.String([]const u8);
185185
186 pub const Error = Allocator.Error || error{LowerFail};186 pub const Error = Allocator.Error || error{LowerFail};
187187
lib/compiler/reduce/Walk.zig+2-2
...@@ -44,7 +44,7 @@ pub const Transformation = union(enum) {...@@ -44,7 +44,7 @@ pub const Transformation = union(enum) {
44 imported_string: []const u8,44 imported_string: []const u8,
45 /// Identifier names that must be renamed in the inlined code or else45 /// Identifier names that must be renamed in the inlined code or else
46 /// will cause ambiguous reference errors.46 /// will cause ambiguous reference errors.
47 in_scope_names: std.StringArrayHashMapUnmanaged(void),47 in_scope_names: std.array_hash_map.String(void),
48 };48 };
49};49};
5050
...@@ -723,7 +723,7 @@ fn walkBuiltinCall(...@@ -723,7 +723,7 @@ fn walkBuiltinCall(
723 try w.transformations.append(.{ .inline_imported_file = .{723 try w.transformations.append(.{ .inline_imported_file = .{
724 .builtin_call_node = call_node,724 .builtin_call_node = call_node,
725 .imported_string = imported_string,725 .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(
727 w.arena,727 w.arena,
728 w.in_scope_names.keys(),728 w.in_scope_names.keys(),
729 &.{},729 &.{},
lib/compiler/resinator/cli.zig+1-1
...@@ -159,7 +159,7 @@ pub const Options = struct {...@@ -159,7 +159,7 @@ pub const Options = struct {
159 default_language_id: ?u16 = null,159 default_language_id: ?u16 = null,
160 default_code_page: ?SupportedCodePage = null,160 default_code_page: ?SupportedCodePage = null,
161 verbose: bool = false,161 verbose: bool = false,
162 symbols: std.StringArrayHashMapUnmanaged(SymbolValue) = .empty,162 symbols: std.array_hash_map.String(SymbolValue) = .empty,
163 null_terminate_string_table_strings: bool = false,163 null_terminate_string_table_strings: bool = false,
164 max_string_literal_codepoints: u15 = lex.default_max_string_literal_codepoints,164 max_string_literal_codepoints: u15 = lex.default_max_string_literal_codepoints,
165 silent_duplicate_control_ids: bool = false,165 silent_duplicate_control_ids: bool = false,
lib/compiler/resinator/cvtres.zig+1-1
...@@ -441,7 +441,7 @@ pub const ResourceDataEntry = extern struct {...@@ -441,7 +441,7 @@ pub const ResourceDataEntry = extern struct {
441const ResourceTree = struct {441const ResourceTree = struct {
442 type_to_name_map: std.ArrayHashMapUnmanaged(NameOrOrdinal, NameToLanguageMap, NameOrOrdinalHashContext, true),442 type_to_name_map: std.ArrayHashMapUnmanaged(NameOrOrdinal, NameToLanguageMap, NameOrOrdinalHashContext, true),
443 rsrc_string_table: std.ArrayHashMapUnmanaged(NameOrOrdinal, void, NameOrOrdinalHashContext, true),443 rsrc_string_table: std.ArrayHashMapUnmanaged(NameOrOrdinal, void, NameOrOrdinalHashContext, true),
444 deduplicated_data: std.StringArrayHashMapUnmanaged(u32),444 deduplicated_data: std.array_hash_map.String(u32),
445 data_offsets: std.ArrayList(u32),445 data_offsets: std.ArrayList(u32),
446 rsrc02_len: u32,446 rsrc02_len: u32,
447 coff_options: CoffOptions,447 coff_options: CoffOptions,
lib/compiler/translate-c/Scope.zig+4-4
...@@ -7,7 +7,7 @@ const Translator = @import("Translator.zig");...@@ -7,7 +7,7 @@ const Translator = @import("Translator.zig");
77
8const Scope = @This();8const Scope = @This();
99
10pub const SymbolTable = std.StringArrayHashMapUnmanaged(ast.Node);10pub const SymbolTable = std.array_hash_map.String(ast.Node);
11pub const AliasList = std.ArrayList(struct {11pub const AliasList = std.ArrayList(struct {
12 alias: []const u8,12 alias: []const u8,
13 name: []const u8,13 name: []const u8,
...@@ -79,7 +79,7 @@ pub const Block = struct {...@@ -79,7 +79,7 @@ pub const Block = struct {
79 /// will be used. This maps the variable's name to the Discard payload, so that if79 /// will be used. This maps the variable's name to the Discard payload, so that if
80 /// the variable is subsequently referenced we can indicate that the discard should80 /// the variable is subsequently referenced we can indicate that the discard should
81 /// be skipped during the intermediate AST -> Zig AST render step.81 /// 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
84 /// When the block corresponds to a function, keep track of the return type84 /// When the block corresponds to a function, keep track of the return type
85 /// so that the return expression can be cast, if necessary85 /// so that the return expression can be cast, if necessary
...@@ -209,7 +209,7 @@ pub const Root = struct {...@@ -209,7 +209,7 @@ pub const Root = struct {
209 base: Scope,209 base: Scope,
210 translator: *Translator,210 translator: *Translator,
211 sym_table: SymbolTable,211 sym_table: SymbolTable,
212 blank_macros: std.StringArrayHashMapUnmanaged(void),212 blank_macros: std.array_hash_map.String(void),
213 nodes: std.ArrayList(ast.Node),213 nodes: std.ArrayList(ast.Node),
214 container_member_fns_map: ContainerMemberFnsHashMap,214 container_member_fns_map: ContainerMemberFnsHashMap,
215215
...@@ -267,7 +267,7 @@ pub const Root = struct {...@@ -267,7 +267,7 @@ pub const Root = struct {
267 const gpa = root.translator.gpa;267 const gpa = root.translator.gpa;
268 const arena = root.translator.arena;268 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;
271 defer member_names.deinit(gpa);271 defer member_names.deinit(gpa);
272 for (root.container_member_fns_map.keys(), root.container_member_fns_map.values()) |container_qt, members| {272 for (root.container_member_fns_map.keys(), root.container_member_fns_map.values()) |container_qt, members| {
273 // Get the container name273 // Get the container name
lib/compiler/translate-c/Translator.zig+3-3
...@@ -123,7 +123,7 @@ anonymous_record_field_names: std.HashMapUnmanaged(...@@ -123,7 +123,7 @@ anonymous_record_field_names: std.HashMapUnmanaged(
123/// a list of names that we found by visiting all the top level decls without123/// a list of names that we found by visiting all the top level decls without
124/// translating them. The other maps are updated as we translate; this one is updated124/// translating them. The other maps are updated as we translate; this one is updated
125/// up front in a pre-processing step.125/// up front in a pre-processing step.
126global_names: std.StringArrayHashMapUnmanaged(void) = .empty,126global_names: std.array_hash_map.String(void) = .empty,
127127
128/// This is similar to `global_names`, but contains names which we would128/// This is similar to `global_names`, but contains names which we would
129/// *like* to use, but do not strictly *have* to if they are unavailable.129/// *like* to use, but do not strictly *have* to if they are unavailable.
...@@ -132,11 +132,11 @@ global_names: std.StringArrayHashMapUnmanaged(void) = .empty,...@@ -132,11 +132,11 @@ global_names: std.StringArrayHashMapUnmanaged(void) = .empty,
132/// may be mangled.132/// may be mangled.
133/// This is distinct from `global_names` so we can detect at a type133/// This is distinct from `global_names` so we can detect at a type
134/// declaration whether or not the name is available.134/// 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
137/// Set of identifiers known to refer to typedef declarations.137/// Set of identifiers known to refer to typedef declarations.
138/// Used when parsing macros.138/// Used when parsing macros.
139typedefs: std.StringArrayHashMapUnmanaged(void) = .empty,139typedefs: std.array_hash_map.String(void) = .empty,
140140
141/// The lhs lval of a compound assignment expression.141/// The lhs lval of a compound assignment expression.
142compound_assign_dummy: ?ZigNode = null,142compound_assign_dummy: ?ZigNode = null,
lib/docs/wasm/Walk.zig+4-4
...@@ -10,9 +10,9 @@ const Oom = error{OutOfMemory};...@@ -10,9 +10,9 @@ const Oom = error{OutOfMemory};
1010
11pub const Decl = @import("Decl.zig");11pub const Decl = @import("Decl.zig");
1212
13pub var files: std.StringArrayHashMapUnmanaged(File) = .empty;13pub var files: std.array_hash_map.String(File) = .empty;
14pub var decls: std.ArrayList(Decl) = .empty;14pub 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
17file: File.Index,17file: File.Index,
1818
...@@ -465,8 +465,8 @@ pub const Scope = struct {...@@ -465,8 +465,8 @@ pub const Scope = struct {
465 const Namespace = struct {465 const Namespace = struct {
466 base: Scope = .{ .tag = .namespace },466 base: Scope = .{ .tag = .namespace },
467 parent: *Scope,467 parent: *Scope,
468 names: std.StringArrayHashMapUnmanaged(Ast.Node.Index) = .empty,468 names: std.array_hash_map.String(Ast.Node.Index) = .empty,
469 doctests: std.StringArrayHashMapUnmanaged(Ast.Node.Index) = .empty,469 doctests: std.array_hash_map.String(Ast.Node.Index) = .empty,
470 decl_index: Decl.Index,470 decl_index: Decl.Index,
471 };471 };
472472
lib/docs/wasm/main.zig+4-4
...@@ -264,7 +264,7 @@ const ErrorIdentifier = packed struct(u64) {...@@ -264,7 +264,7 @@ const ErrorIdentifier = packed struct(u64) {
264};264};
265265
266var string_result: ArrayList(u8) = .empty;266var 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
269export fn decl_error_set(decl_index: Decl.Index) Slice(ErrorIdentifier) {269export fn decl_error_set(decl_index: Decl.Index) Slice(ErrorIdentifier) {
270 return Slice(ErrorIdentifier).init(decl_error_set_fallible(decl_index) catch @panic("OOM"));270 return Slice(ErrorIdentifier).init(decl_error_set_fallible(decl_index) catch @panic("OOM"));
...@@ -305,7 +305,7 @@ fn sort_error_set_result() void {...@@ -305,7 +305,7 @@ fn sort_error_set_result() void {
305305
306fn addErrorsFromDecl(306fn addErrorsFromDecl(
307 decl_index: Decl.Index,307 decl_index: Decl.Index,
308 out: *std.StringArrayHashMapUnmanaged(ErrorIdentifier),308 out: *std.array_hash_map.String(ErrorIdentifier),
309) Oom!void {309) Oom!void {
310 switch (decl_index.get().categorize()) {310 switch (decl_index.get().categorize()) {
311 .error_set => |node| try addErrorsFromExpr(decl_index, out, node),311 .error_set => |node| try addErrorsFromExpr(decl_index, out, node),
...@@ -316,7 +316,7 @@ fn addErrorsFromDecl(...@@ -316,7 +316,7 @@ fn addErrorsFromDecl(
316316
317fn addErrorsFromExpr(317fn addErrorsFromExpr(
318 decl_index: Decl.Index,318 decl_index: Decl.Index,
319 out: *std.StringArrayHashMapUnmanaged(ErrorIdentifier),319 out: *std.array_hash_map.String(ErrorIdentifier),
320 node: Ast.Node.Index,320 node: Ast.Node.Index,
321) Oom!void {321) Oom!void {
322 const decl = decl_index.get();322 const decl = decl_index.get();
...@@ -343,7 +343,7 @@ fn addErrorsFromExpr(...@@ -343,7 +343,7 @@ fn addErrorsFromExpr(
343343
344fn addErrorsFromNode(344fn addErrorsFromNode(
345 decl_index: Decl.Index,345 decl_index: Decl.Index,
346 out: *std.StringArrayHashMapUnmanaged(ErrorIdentifier),346 out: *std.array_hash_map.String(ErrorIdentifier),
347 node: Ast.Node.Index,347 node: Ast.Node.Index,
348) Oom!void {348) Oom!void {
349 const decl = decl_index.get();349 const decl = decl_index.get();
lib/std/Build.zig+3-3
...@@ -33,7 +33,7 @@ user_input_options: UserInputOptionsMap,...@@ -33,7 +33,7 @@ user_input_options: UserInputOptionsMap,
33available_options_map: std.array_hash_map.String(AvailableOption) = .empty,33available_options_map: std.array_hash_map.String(AvailableOption) = .empty,
34invalid_user_input: bool,34invalid_user_input: bool,
35default_step: *Step,35default_step: *Step,
36top_level_steps: std.StringArrayHashMapUnmanaged(*Step.TopLevel),36top_level_steps: std.array_hash_map.String(*Step.TopLevel),
37/// Path to the directory containing build.zig.37/// Path to the directory containing build.zig.
38root: Cache.Path,38root: Cache.Path,
39debug_log_scopes: []const []const u8 = &.{},39debug_log_scopes: []const []const u8 = &.{},
...@@ -78,11 +78,11 @@ pub const Graph = struct {...@@ -78,11 +78,11 @@ pub const Graph = struct {
78 io: Io,78 io: Io,
79 /// Process lifetime.79 /// Process lifetime.
80 arena: Allocator,80 arena: Allocator,
81 system_integration_options: std.StringArrayHashMapUnmanaged(SystemLibraryMode) = .empty,81 system_integration_options: std.array_hash_map.String(SystemLibraryMode) = .empty,
82 system_package_mode: bool = false,82 system_package_mode: bool = false,
83 zig_exe: []const u8,83 zig_exe: []const u8,
84 environ_map: process.Environ.Map,84 environ_map: process.Environ.Map,
85 needed_lazy_dependencies: std.StringArrayHashMapUnmanaged(void) = .empty,85 needed_lazy_dependencies: std.array_hash_map.String(void) = .empty,
86 /// Information about the native target. Computed before build() is invoked.86 /// Information about the native target. Computed before build() is invoked.
87 host: ResolvedTarget,87 host: ResolvedTarget,
88 dependency_cache: InitializedDepMap = .empty,88 dependency_cache: InitializedDepMap = .empty,
lib/std/Build/Module.zig+2-2
...@@ -12,7 +12,7 @@ root_source_file: ?LazyPath,...@@ -12,7 +12,7 @@ root_source_file: ?LazyPath,
12/// The modules that are mapped into this module's import table.12/// The modules that are mapped into this module's import table.
13/// Use `addImport` rather than modifying this field directly in order to13/// Use `addImport` rather than modifying this field directly in order to
14/// maintain step dependency edges.14/// maintain step dependency edges.
15import_table: std.StringArrayHashMapUnmanaged(*Module),15import_table: std.array_hash_map.String(*Module),
1616
17resolved_target: ?std.Build.ResolvedTarget = null,17resolved_target: ?std.Build.ResolvedTarget = null,
18optimize: ?std.builtin.OptimizeMode = null,18optimize: ?std.builtin.OptimizeMode = null,
...@@ -22,7 +22,7 @@ c_macros: ArrayList([]const u8),...@@ -22,7 +22,7 @@ c_macros: ArrayList([]const u8),
22include_dirs: ArrayList(IncludeDir),22include_dirs: ArrayList(IncludeDir),
23lib_paths: ArrayList(LazyPath),23lib_paths: ArrayList(LazyPath),
24rpaths: ArrayList(RPath),24rpaths: ArrayList(RPath),
25frameworks: std.StringArrayHashMapUnmanaged(LinkFrameworkOptions),25frameworks: std.array_hash_map.String(LinkFrameworkOptions),
26link_objects: ArrayList(LinkObject),26link_objects: ArrayList(LinkObject),
2727
28strip: ?bool,28strip: ?bool,
lib/std/Build/Step/Compile.zig+1-1
...@@ -187,7 +187,7 @@ entry: Entry = .default,...@@ -187,7 +187,7 @@ entry: Entry = .default,
187/// List of symbols forced as undefined in the symbol table187/// List of symbols forced as undefined in the symbol table
188/// thus forcing their resolution by the linker.188/// thus forcing their resolution by the linker.
189/// Corresponds to `-u <symbol>` for ELF/MachO and `/include:<symbol>` for COFF/PE.189/// 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
192/// Overrides the default stack size192/// Overrides the default stack size
193stack_size: ?u64 = null,193stack_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)...@@ -115,7 +115,7 @@ pub fn load(gpa: Allocator, io: Io, path: []const u8, arch: std.Target.Cpu.Arch)
115 // necessary because we prefer to use STAB ("symbolic debugging table") symbols,115 // necessary because we prefer to use STAB ("symbolic debugging table") symbols,
116 // but they might not be present, so we track normal symbols too.116 // but they might not be present, so we track normal symbols too.
117 // Indices match 1-1 with those of `symbols`.117 // 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;
119 defer symbol_names.deinit(gpa);119 defer symbol_names.deinit(gpa);
120 try symbol_names.ensureUnusedCapacity(gpa, symtab.nsyms);120 try symbol_names.ensureUnusedCapacity(gpa, symtab.nsyms);
121121
...@@ -380,7 +380,7 @@ test {...@@ -380,7 +380,7 @@ test {
380380
381fn appendStabSymbol(381fn appendStabSymbol(
382 symbols: *std.ArrayList(Symbol),382 symbols: *std.ArrayList(Symbol),
383 symbol_names: *std.StringArrayHashMapUnmanaged(void),383 symbol_names: *std.array_hash_map.String(void),
384 strings: []const u8,384 strings: []const u8,
385 last_sym: Symbol,385 last_sym: Symbol,
386) void {386) void {
lib/std/json/hashmap.zig+4-4
...@@ -6,20 +6,20 @@ const innerParse = @import("static.zig").innerParse;...@@ -6,20 +6,20 @@ const innerParse = @import("static.zig").innerParse;
6const innerParseFromValue = @import("static.zig").innerParseFromValue;6const innerParseFromValue = @import("static.zig").innerParseFromValue;
7const Value = @import("dynamic.zig").Value;7const Value = @import("dynamic.zig").Value;
88
9/// A thin wrapper around `std.StringArrayHashMapUnmanaged` that implements9/// A thin wrapper around `std.array_hash_map.String` that implements
10/// `jsonParse`, `jsonParseFromValue`, and `jsonStringify`.10/// `jsonParse`, `jsonParseFromValue`, and `jsonStringify`.
11/// This is useful when your JSON schema has an object with arbitrary data keys11/// This is useful when your JSON schema has an object with arbitrary data keys
12/// instead of comptime-known struct field names.12/// instead of comptime-known struct field names.
13pub fn ArrayHashMap(comptime T: type) type {13pub fn ArrayHashMap(comptime T: type) type {
14 return struct {14 return struct {
15 map: std.StringArrayHashMapUnmanaged(T) = .empty,15 map: std.array_hash_map.String(T) = .empty,
1616
17 pub fn deinit(self: *@This(), allocator: Allocator) void {17 pub fn deinit(self: *@This(), allocator: Allocator) void {
18 self.map.deinit(allocator);18 self.map.deinit(allocator);
19 }19 }
2020
21 pub fn jsonParse(allocator: Allocator, source: anytype, options: ParseOptions) !@This() {21 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;
23 errdefer map.deinit(allocator);23 errdefer map.deinit(allocator);
2424
25 if (.object_begin != try source.next()) return error.UnexpectedToken;25 if (.object_begin != try source.next()) return error.UnexpectedToken;
...@@ -52,7 +52,7 @@ pub fn ArrayHashMap(comptime T: type) type {...@@ -52,7 +52,7 @@ pub fn ArrayHashMap(comptime T: type) type {
52 pub fn jsonParseFromValue(allocator: Allocator, source: Value, options: ParseOptions) !@This() {52 pub fn jsonParseFromValue(allocator: Allocator, source: Value, options: ParseOptions) !@This() {
53 if (source != .object) return error.UnexpectedToken;53 if (source != .object) return error.UnexpectedToken;
5454
55 var map: std.StringArrayHashMapUnmanaged(T) = .empty;55 var map: std.array_hash_map.String(T) = .empty;
56 errdefer map.deinit(allocator);56 errdefer map.deinit(allocator);
5757
58 var it = source.object.iterator();58 var it = source.object.iterator();
lib/std/process/Preopens.zig+1-1
...@@ -16,7 +16,7 @@ pub const empty: Preopens = switch (native_os) {...@@ -16,7 +16,7 @@ pub const empty: Preopens = switch (native_os) {
1616
17pub const Map = switch (native_os) {17pub const Map = switch (native_os) {
18 // Indexed by file descriptor number.18 // Indexed by file descriptor number.
19 .wasi => std.StringArrayHashMapUnmanaged(void),19 .wasi => std.array_hash_map.String(void),
20 else => void,20 else => void,
21};21};
2222
lib/std/zig/Ast/Render.zig+1-1
...@@ -42,7 +42,7 @@ pub const Fixups = struct {...@@ -42,7 +42,7 @@ pub const Fixups = struct {
42 /// These nodes will be replaced with a different node.42 /// These nodes will be replaced with a different node.
43 replace_nodes_with_node: std.AutoHashMapUnmanaged(Ast.Node.Index, Ast.Node.Index) = .empty,43 replace_nodes_with_node: std.AutoHashMapUnmanaged(Ast.Node.Index, Ast.Node.Index) = .empty,
44 /// Change all identifier names matching the key to be value instead.44 /// 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
47 /// All `@import` builtin calls which refer to a file path will be prefixed47 /// All `@import` builtin calls which refer to a file path will be prefixed
48 /// with this path.48 /// with this path.
src/Compilation.zig+4-4
...@@ -87,7 +87,7 @@ link_inputs: []const link.Input,...@@ -87,7 +87,7 @@ link_inputs: []const link.Input,
87framework_dirs: []const []const u8,87framework_dirs: []const []const u8,
88/// These are only for DLLs dependencies fulfilled by the `.def` files shipped88/// These are only for DLLs dependencies fulfilled by the `.def` files shipped
89/// with Zig. Static libraries are provided as `link.Input` values.89/// with Zig. Static libraries are provided as `link.Input` values.
90windows_libs: std.StringArrayHashMapUnmanaged(void),90windows_libs: std.array_hash_map.String(void),
91/// The number of items in `windows_libs` which we have already built. All items at or after this91/// The number of items in `windows_libs` which we have already built. All items at or after this
92/// index will be built in `performAllTheWork`.92/// index will be built in `performAllTheWork`.
93windows_libs_num_done: u32,93windows_libs_num_done: u32,
...@@ -101,7 +101,7 @@ native_system_include_paths: []const []const u8,...@@ -101,7 +101,7 @@ native_system_include_paths: []const []const u8,
101/// List of symbols forced as undefined in the symbol table101/// List of symbols forced as undefined in the symbol table
102/// thus forcing their resolution by the linker.102/// thus forcing their resolution by the linker.
103/// Corresponds to `-u <symbol>` for ELF/MachO and `/include:<symbol>` for COFF/PE.103/// 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
106c_object_table: std.AutoArrayHashMapUnmanaged(*CObject, void) = .empty,106c_object_table: std.AutoArrayHashMapUnmanaged(*CObject, void) = .empty,
107win32_resource_table: if (dev.env.supports(.win32_resource)) std.AutoArrayHashMapUnmanaged(*Win32Resource, void) else struct {107win32_resource_table: if (dev.env.supports(.win32_resource)) std.AutoArrayHashMapUnmanaged(*Win32Resource, void) else struct {
...@@ -1604,7 +1604,7 @@ pub const CreateOptions = struct {...@@ -1604,7 +1604,7 @@ pub const CreateOptions = struct {
1604 /// implementations still do.1604 /// implementations still do.
1605 lib_directories: []const Cache.Directory = &.{},1605 lib_directories: []const Cache.Directory = &.{},
1606 rpath_list: []const []const u8 = &[0][]const u8{},1606 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,
1608 c_source_files: []const CSourceFile = &.{},1608 c_source_files: []const CSourceFile = &.{},
1609 rc_source_files: []const RcSourceFile = &.{},1609 rc_source_files: []const RcSourceFile = &.{},
1610 manifest_file: ?[]const u8 = null,1610 manifest_file: ?[]const u8 = null,
...@@ -1683,7 +1683,7 @@ pub const CreateOptions = struct {...@@ -1683,7 +1683,7 @@ pub const CreateOptions = struct {
1683 skip_linker_dependencies: bool = false,1683 skip_linker_dependencies: bool = false,
1684 hash_style: link.File.Lld.Elf.HashStyle = .both,1684 hash_style: link.File.Lld.Elf.HashStyle = .both,
1685 entry: Entry = .default,1685 entry: Entry = .default,
1686 force_undefined_symbols: std.StringArrayHashMapUnmanaged(void) = .empty,1686 force_undefined_symbols: std.array_hash_map.String(void) = .empty,
1687 stack_size: ?u64 = null,1687 stack_size: ?u64 = null,
1688 image_base: ?u64 = null,1688 image_base: ?u64 = null,
1689 version: ?std.SemanticVersion = null,1689 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...@@ -1725,7 +1725,7 @@ fn computeHash(f: *Fetch, pkg_path: Cache.Path, filter: Filter) RunError!Compute
17251725
1726 // Track directories which had any files deleted from them so that empty directories1726 // Track directories which had any files deleted from them so that empty directories
1727 // can be deleted.1727 // can be deleted.
1728 var sus_dirs: std.StringArrayHashMapUnmanaged(void) = .empty;1728 var sus_dirs: std.array_hash_map.String(void) = .empty;
1729 defer sus_dirs.deinit(gpa);1729 defer sus_dirs.deinit(gpa);
17301730
1731 var walker = try root_dir.walk(gpa);1731 var walker = try root_dir.walk(gpa);
...@@ -2002,7 +2002,7 @@ fn normalizePath(bytes: []u8) void {...@@ -2002,7 +2002,7 @@ fn normalizePath(bytes: []u8) void {
2002}2002}
20032003
2004const Filter = struct {2004const Filter = struct {
2005 include_paths: std.StringArrayHashMapUnmanaged(void) = .empty,2005 include_paths: std.array_hash_map.String(void) = .empty,
20062006
2007 /// sub_path is relative to the package root.2007 /// sub_path is relative to the package root.
2008 pub fn includePath(self: *const Filter, sub_path: []const u8) bool {2008 pub fn includePath(self: *const Filter, sub_path: []const u8) bool {
src/Package/Manifest.zig+4-4
...@@ -42,9 +42,9 @@ name: []const u8,...@@ -42,9 +42,9 @@ name: []const u8,
42id: u32,42id: u32,
43version: std.SemanticVersion,43version: std.SemanticVersion,
44version_node: Ast.Node.Index,44version_node: Ast.Node.Index,
45dependencies: std.StringArrayHashMapUnmanaged(Dependency),45dependencies: std.array_hash_map.String(Dependency),
46dependencies_node: Ast.Node.OptionalIndex,46dependencies_node: Ast.Node.OptionalIndex,
47paths: std.StringArrayHashMapUnmanaged(void),47paths: std.array_hash_map.String(void),
48minimum_zig_version: ?std.SemanticVersion,48minimum_zig_version: ?std.SemanticVersion,
4949
50errors: []ErrorMessage,50errors: []ErrorMessage,
...@@ -144,9 +144,9 @@ const Parse = struct {...@@ -144,9 +144,9 @@ const Parse = struct {
144 id: u32,144 id: u32,
145 version: std.SemanticVersion,145 version: std.SemanticVersion,
146 version_node: Ast.Node.Index,146 version_node: Ast.Node.Index,
147 dependencies: std.StringArrayHashMapUnmanaged(Dependency),147 dependencies: std.array_hash_map.String(Dependency),
148 dependencies_node: Ast.Node.OptionalIndex,148 dependencies_node: Ast.Node.OptionalIndex,
149 paths: std.StringArrayHashMapUnmanaged(void),149 paths: std.array_hash_map.String(void),
150 allow_missing_paths_field: bool,150 allow_missing_paths_field: bool,
151 minimum_zig_version: ?std.SemanticVersion,151 minimum_zig_version: ?std.SemanticVersion,
152152
src/Package/Module.zig+1-1
...@@ -35,7 +35,7 @@ cc_argv: []const []const u8,...@@ -35,7 +35,7 @@ cc_argv: []const []const u8,
35structured_cfg: bool,35structured_cfg: bool,
36no_builtin: bool,36no_builtin: bool,
3737
38pub const Deps = std.StringArrayHashMapUnmanaged(*Module);38pub const Deps = std.array_hash_map.String(*Module);
3939
40pub const Tree = struct {40pub const Tree = struct {
41 /// Each `Package` exposes a `Module` with build.zig as its root source file.41 /// 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 {...@@ -2513,7 +2513,7 @@ fn airAssembly(self: *FuncGen, inst: Air.Inst.Index) TodoError!Builder.Value {
2513 var llvm_param_i: usize = 0;2513 var llvm_param_i: usize = 0;
2514 var total_i: usize = 0;2514 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;
2517 try name_map.ensureUnusedCapacity(arena, max_param_count);2517 try name_map.ensureUnusedCapacity(arena, max_param_count);
25182518
2519 var it = unwrapped_asm.iterateOutputs();2519 var it = unwrapped_asm.iterateOutputs();
src/codegen/spirv/Assembler.zig+2-2
...@@ -35,8 +35,8 @@ inst: struct {...@@ -35,8 +35,8 @@ inst: struct {
35 return null;35 return null;
36 }36 }
37} = .{},37} = .{},
38value_map: std.StringArrayHashMapUnmanaged(AsmValue) = .{},38value_map: std.array_hash_map.String(AsmValue) = .{},
39inst_map: std.StringArrayHashMapUnmanaged(void) = .empty,39inst_map: std.array_hash_map.String(void) = .empty,
4040
41const Operand = union(enum) {41const Operand = union(enum) {
42 /// Any 'simple' 32-bit value. This could be a mask or42 /// Any 'simple' 32-bit value. This could be a mask or
src/codegen/spirv/Module.zig+1-1
...@@ -66,7 +66,7 @@ cache: struct {...@@ -66,7 +66,7 @@ cache: struct {
66 extended_instruction_set: std.AutoHashMapUnmanaged(spec.InstructionSet, Id) = .empty,66 extended_instruction_set: std.AutoHashMapUnmanaged(spec.InstructionSet, Id) = .empty,
67 decorations: std.AutoHashMapUnmanaged(struct { Id, spec.Decoration }, void) = .empty,67 decorations: std.AutoHashMapUnmanaged(struct { Id, spec.Decoration }, void) = .empty,
68 builtins: std.AutoHashMapUnmanaged(struct { spec.BuiltIn, spec.StorageClass }, Decl.Index) = .empty,68 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
71 bool_const: [2]?Id = .{ null, null },71 bool_const: [2]?Id = .{ null, null },
72 constants: std.ArrayHashMapUnmanaged(Constant, Id, Constant.HashContext, true) = .empty,72 constants: std.ArrayHashMapUnmanaged(Constant, Id, Constant.HashContext, true) = .empty,
src/libs/mingw/implib.zig+1-1
...@@ -245,7 +245,7 @@ pub fn getMembers(...@@ -245,7 +245,7 @@ pub fn getMembers(
245 };245 };
246 var renames: std.ArrayList(DeferredExport) = .empty;246 var renames: std.ArrayList(DeferredExport) = .empty;
247 defer renames.deinit(allocator);247 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;
249 defer regular_imports.deinit(allocator);249 defer regular_imports.deinit(allocator);
250250
251 for (module_def.exports.items) |*e| {251 for (module_def.exports.items) |*e| {
src/link.zig+1-1
...@@ -471,7 +471,7 @@ pub const File = struct {...@@ -471,7 +471,7 @@ pub const File = struct {
471 /// wrapper for a system function. The wrapper function should be called471 /// wrapper for a system function. The wrapper function should be called
472 /// __wrap_symbol. If it wishes to call the system function, it should call472 /// __wrap_symbol. If it wishes to call the system function, it should call
473 /// __real_symbol.473 /// __real_symbol.
474 symbol_wrap_set: std.StringArrayHashMapUnmanaged(void),474 symbol_wrap_set: std.array_hash_map.String(void),
475475
476 compatibility_version: ?std.SemanticVersion,476 compatibility_version: ?std.SemanticVersion,
477477
src/link/Elf.zig+4-4
...@@ -2,7 +2,7 @@ pub const Atom = @import("Elf/Atom.zig");...@@ -2,7 +2,7 @@ pub const Atom = @import("Elf/Atom.zig");
22
3base: link.File,3base: link.File,
4zig_object: ?*ZigObject,4zig_object: ?*ZigObject,
5rpath_table: std.StringArrayHashMapUnmanaged(void),5rpath_table: std.array_hash_map.String(void),
6image_base: u64,6image_base: u64,
7z_nodelete: bool,7z_nodelete: bool,
8z_notext: bool,8z_notext: bool,
...@@ -30,7 +30,7 @@ file_handles: std.ArrayList(File.Handle) = .empty,...@@ -30,7 +30,7 @@ file_handles: std.ArrayList(File.Handle) = .empty,
30zig_object_index: ?File.Index = null,30zig_object_index: ?File.Index = null,
31linker_defined_index: ?File.Index = null,31linker_defined_index: ?File.Index = null,
32objects: std.ArrayList(File.Index) = .empty,32objects: std.ArrayList(File.Index) = .empty,
33shared_objects: std.StringArrayHashMapUnmanaged(File.Index) = .empty,33shared_objects: std.array_hash_map.String(File.Index) = .empty,
3434
35/// List of all output sections and their associated metadata.35/// List of all output sections and their associated metadata.
36sections: std.MultiArrayList(Section) = .{},36sections: std.MultiArrayList(Section) = .{},
...@@ -249,7 +249,7 @@ pub fn createEmpty(...@@ -249,7 +249,7 @@ pub fn createEmpty(
249 const is_dyn_lib = output_mode == .Lib and link_mode == .dynamic;249 const is_dyn_lib = output_mode == .Lib and link_mode == .dynamic;
250 const default_sym_version: elf.Versym = if (is_dyn_lib or comp.config.rdynamic) .GLOBAL else .LOCAL;250 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;
253 try rpath_table.entries.resize(arena, options.rpath_list.len);253 try rpath_table.entries.resize(arena, options.rpath_list.len);
254 @memcpy(rpath_table.entries.items(.key), options.rpath_list);254 @memcpy(rpath_table.entries.items(.key), options.rpath_list);
255 try rpath_table.reIndex(arena);255 try rpath_table.reIndex(arena);
...@@ -1112,7 +1112,7 @@ fn parseDso(...@@ -1112,7 +1112,7 @@ fn parseDso(
1112 io: Io,1112 io: Io,
1113 diags: *Diags,1113 diags: *Diags,
1114 dso: link.Input.Dso,1114 dso: link.Input.Dso,
1115 shared_objects: *std.StringArrayHashMapUnmanaged(File.Index),1115 shared_objects: *std.array_hash_map.String(File.Index),
1116 files: *std.MultiArrayList(File.Entry),1116 files: *std.MultiArrayList(File.Entry),
1117 target: *const std.Target,1117 target: *const std.Target,
1118) !void {1118) !void {
src/link/MachO/Dylib.zig+1-1
...@@ -14,7 +14,7 @@ symbols: std.ArrayList(Symbol) = .empty,...@@ -14,7 +14,7 @@ symbols: std.ArrayList(Symbol) = .empty,
14symbols_extra: std.ArrayList(u32) = .empty,14symbols_extra: std.ArrayList(u32) = .empty,
15globals: std.ArrayList(MachO.SymbolResolver.Index) = .empty,15globals: std.ArrayList(MachO.SymbolResolver.Index) = .empty,
16dependents: std.ArrayList(Id) = .empty,16dependents: std.ArrayList(Id) = .empty,
17rpaths: std.StringArrayHashMapUnmanaged(void) = .empty,17rpaths: std.array_hash_map.String(void) = .empty,
18umbrella: File.Index,18umbrella: File.Index,
19platform: ?MachO.Platform = null,19platform: ?MachO.Platform = null,
2020
src/link/Wasm/Archive.zig+1-1
...@@ -12,7 +12,7 @@ toc: Toc,...@@ -12,7 +12,7 @@ toc: Toc,
1212
13/// Key points into `LazyArchive` `file_contents`.13/// Key points into `LazyArchive` `file_contents`.
14/// Value is allocated with gpa.14/// Value is allocated with gpa.
15const Toc = std.StringArrayHashMapUnmanaged(std.ArrayList(u32));15const Toc = std.array_hash_map.String(std.ArrayList(u32));
1616
17const ARMAG = std.elf.ARMAG;17const ARMAG = std.elf.ARMAG;
18const ARFMAG = std.elf.ARFMAG;18const ARFMAG = std.elf.ARFMAG;
src/main.zig+6-6
...@@ -987,7 +987,7 @@ fn buildOutputType(...@@ -987,7 +987,7 @@ fn buildOutputType(
987 var test_no_exec = false;987 var test_no_exec = false;
988 var test_execve = false;988 var test_execve = false;
989 var entry: Compilation.CreateOptions.Entry = .default;989 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;
991 var stack_size: ?u64 = null;991 var stack_size: ?u64 = null;
992 var image_base: ?u64 = null;992 var image_base: ?u64 = null;
993 var link_eh_frame_hdr = false;993 var link_eh_frame_hdr = false;
...@@ -1024,7 +1024,7 @@ fn buildOutputType(...@@ -1024,7 +1024,7 @@ fn buildOutputType(
1024 // These are before resolving sysroot.1024 // These are before resolving sysroot.
1025 var extra_cflags: std.ArrayList([]const u8) = .empty;1025 var extra_cflags: std.ArrayList([]const u8) = .empty;
1026 var extra_rcflags: std.ArrayList([]const u8) = .empty;1026 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;
1028 var rc_includes: std.zig.RcIncludes = .any;1028 var rc_includes: std.zig.RcIncludes = .any;
1029 var manifest_file: ?[]const u8 = null;1029 var manifest_file: ?[]const u8 = null;
1030 var linker_export_symbol_names: std.ArrayList([]const u8) = .empty;1030 var linker_export_symbol_names: std.ArrayList([]const u8) = .empty;
...@@ -3592,7 +3592,7 @@ fn buildOutputType(...@@ -3592,7 +3592,7 @@ fn buildOutputType(
3592 defer file_system_inputs.deinit(gpa);3592 defer file_system_inputs.deinit(gpa);
35933593
3594 // Deduplicate rpath entries3594 // Deduplicate rpath entries
3595 var rpath_dedup = std.StringArrayHashMapUnmanaged(void){};3595 var rpath_dedup = std.array_hash_map.String(void){};
3596 for (create_module.rpath_list.items) |rpath| {3596 for (create_module.rpath_list.items) |rpath| {
3597 try rpath_dedup.put(arena, rpath, {});3597 try rpath_dedup.put(arena, rpath, {});
3598 }3598 }
...@@ -3896,7 +3896,7 @@ fn buildOutputType(...@@ -3896,7 +3896,7 @@ fn buildOutputType(
38963896
3897const CreateModule = struct {3897const CreateModule = struct {
3898 dirs: Compilation.Directories,3898 dirs: Compilation.Directories,
3899 modules: std.StringArrayHashMapUnmanaged(CliModule),3899 modules: std.array_hash_map.String(CliModule),
3900 opts: Compilation.Config.Options,3900 opts: Compilation.Config.Options,
3901 dynamic_linker: ?[]const u8,3901 dynamic_linker: ?[]const u8,
3902 object_format: ?[]const u8,3902 object_format: ?[]const u8,
...@@ -3908,7 +3908,7 @@ const CreateModule = struct {...@@ -3908,7 +3908,7 @@ const CreateModule = struct {
3908 /// link_libcpp, and then the libraries are filtered into3908 /// link_libcpp, and then the libraries are filtered into
3909 /// `unresolved_link_inputs` and `windows_libs`.3909 /// `unresolved_link_inputs` and `windows_libs`.
3910 cli_link_inputs: std.ArrayList(link.UnresolvedInput),3910 cli_link_inputs: std.ArrayList(link.UnresolvedInput),
3911 windows_libs: std.StringArrayHashMapUnmanaged(void),3911 windows_libs: std.array_hash_map.String(void),
3912 /// The local variable `unresolved_link_inputs` is fed into library3912 /// The local variable `unresolved_link_inputs` is fed into library
3913 /// resolution, mutating the input array, and producing this data as3913 /// resolution, mutating the input array, and producing this data as
3914 /// output. Allocated with gpa.3914 /// output. Allocated with gpa.
...@@ -3926,7 +3926,7 @@ const CreateModule = struct {...@@ -3926,7 +3926,7 @@ const CreateModule = struct {
3926 lib_dir_args: std.ArrayList([]const u8),3926 lib_dir_args: std.ArrayList([]const u8),
3927 libc_installation: ?LibCInstallation,3927 libc_installation: ?LibCInstallation,
3928 want_native_include_dirs: bool,3928 want_native_include_dirs: bool,
3929 frameworks: std.StringArrayHashMapUnmanaged(Framework),3929 frameworks: std.array_hash_map.String(Framework),
3930 native_system_include_paths: []const []const u8,3930 native_system_include_paths: []const []const u8,
3931 framework_dirs: std.ArrayList([]const u8),3931 framework_dirs: std.ArrayList([]const u8),
3932 rpath_list: std.ArrayList([]const u8),3932 rpath_list: std.ArrayList([]const u8),