zig

commit c9c7ede2f9be23fd212d968fbc2fdec6ebefdeeb (tree)
parent 1a99c99ee99fa3ca43935fe7d7d0865145b82d4e
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed, 27 Nov 2024 13:53:39 -0800

introduce std.ArrayHashMap.reinit

Diffstat:
M
lib/std/array_hash_map.zig
 | 
8
++++++--

1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/std/array_hash_map.zig b/lib/std/array_hash_map.zig
@@ -621,15 +621,19 @@ pub fn ArrayHashMapUnmanaged(
 
         pub fn init(allocator: Allocator, key_list: []const K, value_list: []const V) !Self {
             var self: Self = .{};
+            errdefer self.deinit(allocator);
+            try self.reinit(allocator, key_list, value_list);
+            return self;
+        }
+
+        pub fn reinit(self: *Self, allocator: Allocator, key_list: []const K, value_list: []const V) !void {
             try self.entries.resize(allocator, key_list.len);
-            errdefer self.entries.deinit(allocator);
             @memcpy(self.keys(), key_list);
             if (@sizeOf(V) != 0) {
                 assert(key_list.len == value_list.len);
                 @memcpy(self.values(), value_list);
             }
             try self.reIndex(allocator);
-            return self;
         }
 
         /// Frees the backing allocation and leaves the map in an undefined state.