authorgravatar for seda18@rolmail.netDavid Senoner <seda18@rolmail.net> 2026-05-26 16:50:37+02:00
committergravatar for seda18@rolmail.netDavid Senoner <seda18@rolmail.net> 2026-06-10 16:14:58+02:00
logc91727108ec70019b0e1940e719bbf795ebf26c8
tree0988752b6bca7192d63a5db7923d5fa93d5d9992
parent37651eea8944e12df08328012dd3ff151b12c4e7
signaturelock-open Commit is signed but in an unrecognized format.

Replace usages of `ArrayHashMapUnmanaged` with `array_hash_map.Custom`

18 files changed, 31 insertions(+), 31 deletions(-)

lib/compiler/Maker/Fuzz.zig+1-1
......@@ -273,7 +273,7 @@ pub fn serveSourcesTar(fuzz: *Fuzz, req: *std.http.Server.Request) !void {
273273 defer arena_state.deinit();
274274 const arena = arena_state.allocator();
275275
276 const DedupTable = std.ArrayHashMapUnmanaged(Build.Cache.Path, void, Build.Cache.Path.TableAdapter, false);
276 const DedupTable = std.array_hash_map.Custom(Build.Cache.Path, void, Build.Cache.Path.TableAdapter, false);
277277 var dedup_table: DedupTable = .empty;
278278 defer dedup_table.deinit(gpa);
279279
lib/compiler/Maker/Step.zig+1-1
......@@ -180,7 +180,7 @@ pub const Inputs = struct {
180180 .table = .{},
181181 };
182182
183 pub const Table = std.ArrayHashMapUnmanaged(Path, Files, Path.TableAdapter, false);
183 pub const Table = std.array_hash_map.Custom(Path, Files, Path.TableAdapter, false);
184184 /// The special file name "." means any changes inside the directory.
185185 pub const Files = std.ArrayList([]const u8);
186186
lib/compiler/Maker/Step/Compile.zig+1-1
......@@ -121,7 +121,7 @@ fn updateGeneratedFile(
121121/// the root module. The root module is guaranteed to be first.
122122const ModuleList = std.array_hash_map.Auto(Configuration.Module.Index, Configuration.String);
123123/// Keyed on the first key in the module list.
124pub const ModuleGraph = std.ArrayHashMapUnmanaged(ModuleList, void, ModuleListContext, false);
124pub const ModuleGraph = std.array_hash_map.Custom(ModuleList, void, ModuleListContext, false);
125125
126126const ModuleListContext = struct {
127127 pub fn eql(ctx: @This(), a: ModuleList, b: ModuleList) bool {
lib/compiler/Maker/Watch.zig+3-3
......@@ -27,7 +27,7 @@ pub const have_impl = Os != void;
2727/// interested in noticing changes to.
2828///
2929/// Value is generation.
30const DirTable = std.ArrayHashMapUnmanaged(Cache.Path, void, Cache.Path.TableAdapter, false);
30const DirTable = std.array_hash_map.Custom(Cache.Path, void, Cache.Path.TableAdapter, false);
3131
3232/// Special key of "." means any changes in this directory trigger the steps.
3333const ReactionSet = std.array_hash_map.String(StepSet);
......@@ -49,7 +49,7 @@ const Os = switch (builtin.os.tag) {
4949 poll_fds: std.array_hash_map.Auto(MountId, posix.pollfd),
5050
5151 const MountId = i32;
52 const HandleTable = std.ArrayHashMapUnmanaged(FileHandle, struct { mount_id: MountId, reaction_set: ReactionSet }, FileHandle.Adapter, false);
52 const HandleTable = std.array_hash_map.Custom(FileHandle, struct { mount_id: MountId, reaction_set: ReactionSet }, FileHandle.Adapter, false);
5353
5454 const fan_mask: std.os.linux.fanotify.MarkMask = .{
5555 .CLOSE_WRITE = true,
......@@ -314,7 +314,7 @@ const Os = switch (builtin.os.tag) {
314314 const windows = std.os.windows;
315315
316316 /// Keyed differently but indexes correspond 1:1 with `dir_table`.
317 handle_table: std.ArrayHashMapUnmanaged(*Directory, void, Directory.TableAdapter, false),
317 handle_table: std.array_hash_map.Custom(*Directory, void, Directory.TableAdapter, false),
318318 ready_dirs: std.DoublyLinkedList,
319319
320320 const FileId = struct {
lib/compiler/resinator/cvtres.zig+3-3
......@@ -439,8 +439,8 @@ pub const ResourceDataEntry = extern struct {
439439
440440/// type -> name -> language
441441const ResourceTree = struct {
442 type_to_name_map: std.ArrayHashMapUnmanaged(NameOrOrdinal, NameToLanguageMap, NameOrOrdinalHashContext, true),
443 rsrc_string_table: std.ArrayHashMapUnmanaged(NameOrOrdinal, void, NameOrOrdinalHashContext, true),
442 type_to_name_map: std.array_hash_map.Custom(NameOrOrdinal, NameToLanguageMap, NameOrOrdinalHashContext, true),
443 rsrc_string_table: std.array_hash_map.Custom(NameOrOrdinal, void, NameOrOrdinalHashContext, true),
444444 deduplicated_data: std.array_hash_map.String(u32),
445445 data_offsets: std.ArrayList(u32),
446446 rsrc02_len: u32,
......@@ -452,7 +452,7 @@ const ResourceTree = struct {
452452 original_index: usize,
453453 };
454454 const LanguageToResourceMap = std.array_hash_map.Auto(Language, RelocatableResource);
455 const NameToLanguageMap = std.ArrayHashMapUnmanaged(NameOrOrdinal, LanguageToResourceMap, NameOrOrdinalHashContext, true);
455 const NameToLanguageMap = std.array_hash_map.Custom(NameOrOrdinal, LanguageToResourceMap, NameOrOrdinalHashContext, true);
456456
457457 const NameOrOrdinalHashContext = struct {
458458 pub fn hash(self: @This(), v: NameOrOrdinal) u32 {
lib/compiler/translate-c/Scope.zig+1-1
......@@ -18,7 +18,7 @@ pub const ContainerMemberFns = struct {
1818 container_decl_ptr: *ast.Node,
1919 member_fns: std.ArrayList(*ast.Payload.Func) = .empty,
2020};
21pub const ContainerMemberFnsHashMap = std.ArrayHashMapUnmanaged(
21pub const ContainerMemberFnsHashMap = std.array_hash_map.Custom(
2222 aro.QualType,
2323 ContainerMemberFns,
2424 struct {
lib/fuzzer.zig+3-3
......@@ -340,7 +340,7 @@ const Fuzzer = struct {
340340 quality_buf: []Input.Best,
341341 input_buf: []Input.Best.Map,
342342 },
343 seen_uids: std.ArrayHashMapUnmanaged(Uid, struct {
343 seen_uids: std.array_hash_map.Custom(Uid, struct {
344344 slices: union {
345345 ints: std.ArrayList([]u64),
346346 bytes: std.ArrayList(Input.Data.Bytes),
......@@ -505,7 +505,7 @@ const Fuzzer = struct {
505505 }
506506 };
507507
508 pub const UidSlices = std.ArrayHashMapUnmanaged(Uid, struct {
508 pub const UidSlices = std.array_hash_map.Custom(Uid, struct {
509509 base: u32,
510510 len: u32,
511511 }, Uid.hashmap_ctx, false);
......@@ -584,7 +584,7 @@ const Fuzzer = struct {
584584 };
585585
586586 pub const Builder = struct {
587 uid_slices: std.ArrayHashMapUnmanaged(Uid, union {
587 uid_slices: std.array_hash_map.Custom(Uid, union {
588588 ints: std.MultiArrayList(struct {
589589 value: u64,
590590 order_i: u32,
lib/std/Build/Cache.zig+1-1
......@@ -351,7 +351,7 @@ pub const Manifest = struct {
351351 };
352352 };
353353
354 pub const Files = std.ArrayHashMapUnmanaged(File, void, FilesContext, false);
354 pub const Files = std.array_hash_map.Custom(File, void, FilesContext, false);
355355
356356 pub const FilesContext = struct {
357357 pub fn hash(fc: FilesContext, file: File) u32 {
lib/std/debug/Coverage.zig+2-2
......@@ -15,13 +15,13 @@ const assert = std.debug.assert;
1515/// String memory references the memory-mapped debug information.
1616///
1717/// Protected by `mutex`.
18directories: std.ArrayHashMapUnmanaged(String, void, String.MapContext, false),
18directories: std.array_hash_map.Custom(String, void, String.MapContext, false),
1919/// Provides a globally-scoped integer index for files.
2020///
2121/// String memory references the memory-mapped debug information.
2222///
2323/// Protected by `mutex`.
24files: std.ArrayHashMapUnmanaged(File, void, File.MapContext, false),
24files: std.array_hash_map.Custom(File, void, File.MapContext, false),
2525string_bytes: std.ArrayList(u8),
2626/// Protects the other fields.
2727mutex: Io.Mutex,
lib/std/debug/MachOFile.zig+2-2
......@@ -305,7 +305,7 @@ const OFile = struct {
305305 symtab_raw: []align(1) const macho.nlist_64,
306306 /// All named symbols in `symtab_raw`. Stored `u32` key is the index into `symtab_raw`. Accessed
307307 /// through `SymbolAdapter`, so that the symbol name is used as the logical key.
308 symbols_by_name: std.ArrayHashMapUnmanaged(u32, void, void, true),
308 symbols_by_name: std.array_hash_map.Custom(u32, void, void, true),
309309
310310 const SymbolAdapter = struct {
311311 strtab: []const u8,
......@@ -476,7 +476,7 @@ fn loadOFile(gpa: Allocator, io: Io, o_file_name: []const u8) !OFile {
476476 const symtab_raw: []align(1) const macho.nlist_64 = @ptrCast(mapped_ofile[symtab_cmd.symoff..][0..n_sym_bytes]);
477477
478478 // TODO handle tentative (common) symbols
479 var symbols_by_name: std.ArrayHashMapUnmanaged(u32, void, void, true) = .empty;
479 var symbols_by_name: std.array_hash_map.Custom(u32, void, void, true) = .empty;
480480 defer symbols_by_name.deinit(gpa);
481481 try symbols_by_name.ensureUnusedCapacity(gpa, @intCast(symtab_raw.len));
482482 for (symtab_raw, 0..) |sym_raw, sym_index| {
lib/std/debug/SelfInfo/MachO.zig+1-1
......@@ -1,6 +1,6 @@
11mutex: Io.Mutex,
22/// Accessed through `Module.Adapter`.
3modules: std.ArrayHashMapUnmanaged(Module, void, Module.Context, false),
3modules: std.array_hash_map.Custom(Module, void, Module.Context, false),
44
55pub const init: SelfInfo = .{
66 .mutex = .init,
lib/std/process/Environ.zig+1-1
......@@ -101,7 +101,7 @@ pub const Map = struct {
101101 array_hash_map: ArrayHashMap,
102102 allocator: Allocator,
103103
104 const ArrayHashMap = std.ArrayHashMapUnmanaged([]const u8, []const u8, EnvNameHashContext, false);
104 const ArrayHashMap = std.array_hash_map.Custom([]const u8, []const u8, EnvNameHashContext, false);
105105
106106 pub const Size = usize;
107107
src/Compilation.zig+1-1
......@@ -4360,7 +4360,7 @@ pub fn addModuleErrorMsg(
43604360
43614361 // De-duplicate error notes. The main use case in mind for this is
43624362 // too many "note: called from here" notes when eval branch quota is reached.
4363 var notes: std.ArrayHashMapUnmanaged(ErrorBundle.ErrorMessage, void, ErrorNoteHashContext, true) = .empty;
4363 var notes: std.array_hash_map.Custom(ErrorBundle.ErrorMessage, void, ErrorNoteHashContext, true) = .empty;
43644364 defer notes.deinit(gpa);
43654365
43664366 var last_note_loc: ?std.zig.Loc = null;
src/InternPool.zig+1-1
......@@ -1587,7 +1587,7 @@ fn getIndexMask(ip: *const InternPool, comptime BackingInt: type) u32 {
15871587 return @as(u32, std.math.maxInt(BackingInt)) >> ip.tid_width;
15881588}
15891589
1590const FieldMap = std.ArrayHashMapUnmanaged(void, void, std.array_hash_map.AutoContext(void), false);
1590const FieldMap = std.array_hash_map.Custom(void, void, std.array_hash_map.AutoContext(void), false);
15911591
15921592/// An index into `maps` which might be `none`.
15931593pub const OptionalMapIndex = enum(u32) {
src/Package/Fetch.zig+1-1
......@@ -164,7 +164,7 @@ pub const JobQueue = struct {
164164 };
165165 pub const Table = std.array_hash_map.Auto(Package.Hash, *Fetch);
166166 pub const UnlazySet = std.array_hash_map.Auto(Package.Hash, void);
167 pub const ForkSet = std.ArrayHashMapUnmanaged(Fork, void, Fork.Context, false);
167 pub const ForkSet = std.array_hash_map.Custom(Fork, void, Fork.Context, false);
168168
169169 pub const Fork = struct {
170170 path: Cache.Path,
src/Zcu.zig+4-4
......@@ -125,7 +125,7 @@ module_roots: std.array_hash_map.Auto(*Package.Module, File.Index.Optional) = .e
125125///
126126/// Not serialized. This state is reconstructed during the first call to
127127/// `Compilation.update` of the process for a given `Compilation`.
128import_table: std.ArrayHashMapUnmanaged(
128import_table: std.array_hash_map.Custom(
129129 File.Index,
130130 void,
131131 struct {
......@@ -162,7 +162,7 @@ multi_module_err: ?struct {
162162/// on the `Compilation.Path` of the `EmbedFile`.
163163///
164164/// This table owns all of the `*EmbedFile` memory, which is allocated into gpa.
165embed_table: std.ArrayHashMapUnmanaged(
165embed_table: std.array_hash_map.Custom(
166166 *EmbedFile,
167167 void,
168168 struct {
......@@ -840,9 +840,9 @@ pub const Namespace = struct {
840840 /// Will be a struct, enum, union, or opaque.
841841 owner_type: InternPool.Index,
842842 /// Members of the namespace which are marked `pub`.
843 pub_decls: std.ArrayHashMapUnmanaged(InternPool.Nav.Index, void, NavNameContext, true) = .empty,
843 pub_decls: std.array_hash_map.Custom(InternPool.Nav.Index, void, NavNameContext, true) = .empty,
844844 /// Members of the namespace which are *not* marked `pub`.
845 priv_decls: std.ArrayHashMapUnmanaged(InternPool.Nav.Index, void, NavNameContext, true) = .empty,
845 priv_decls: std.array_hash_map.Custom(InternPool.Nav.Index, void, NavNameContext, true) = .empty,
846846 /// All `comptime` declarations in this namespace. We store these purely so that incremental
847847 /// compilation can re-use the existing `ComptimeUnit`s when a namespace changes.
848848 comptime_decls: std.ArrayList(InternPool.ComptimeUnit.Id) = .empty,
src/codegen/spirv/Module.zig+3-3
......@@ -58,8 +58,8 @@ cache: struct {
5858 float_types: std.AutoHashMapUnmanaged(std.lang.Type.Float, Id) = .empty,
5959 vector_types: std.AutoHashMapUnmanaged(struct { Id, u32 }, Id) = .empty,
6060 array_types: std.AutoHashMapUnmanaged(struct { Id, Id }, Id) = .empty,
61 struct_types: std.ArrayHashMapUnmanaged(StructType, Id, StructType.HashContext, true) = .empty,
62 fn_types: std.ArrayHashMapUnmanaged(FnType, Id, FnType.HashContext, true) = .empty,
61 struct_types: std.array_hash_map.Custom(StructType, Id, StructType.HashContext, true) = .empty,
62 fn_types: std.array_hash_map.Custom(FnType, Id, FnType.HashContext, true) = .empty,
6363
6464 capabilities: std.AutoHashMapUnmanaged(spec.Capability, void) = .empty,
6565 extensions: std.StringHashMapUnmanaged(void) = .empty,
......@@ -69,7 +69,7 @@ cache: struct {
6969 strings: std.array_hash_map.String(Id) = .empty,
7070
7171 bool_const: [2]?Id = .{ null, null },
72 constants: std.ArrayHashMapUnmanaged(Constant, Id, Constant.HashContext, true) = .empty,
72 constants: std.array_hash_map.Custom(Constant, Id, Constant.HashContext, true) = .empty,
7373
7474 spirv_types: std.AutoHashMapUnmanaged(InternPool.Index, Id) = .empty,
7575} = .{},
src/link/SpirV/lower_invocation_globals.zig+1-1
......@@ -342,7 +342,7 @@ const ModuleBuilder = struct {
342342 entry_point_new_id_base: u32,
343343 /// A set of all function types in the new program. SPIR-V mandates that these are unique,
344344 /// and until a general type deduplication pass is programmed, we just handle it here via this.
345 function_types: std.ArrayHashMapUnmanaged(FunctionType, ResultId, FunctionType.Context, true) = .empty,
345 function_types: std.array_hash_map.Custom(FunctionType, ResultId, FunctionType.Context, true) = .empty,
346346 /// Maps functions to new information required for creating the module
347347 function_new_info: std.array_hash_map.Auto(ResultId, FunctionNewInfo) = .empty,
348348 /// Offset of the functions section in the new binary.