From 07f4da1e222c92a4da1a95bb73925eb530638464 Mon Sep 17 00:00:00 2001 From: Josh Wolfe Date: Sun, 9 Jul 2023 18:53:00 -0400 Subject: [PATCH] rename --- lib/std/json.zig | 2 +- lib/std/json/hashmap.zig | 2 +- lib/std/json/hashmap_test.zig | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/std/json.zig b/lib/std/json.zig index b6535a4702..f8480d4207 100644 --- a/lib/std/json.zig +++ b/lib/std/json.zig @@ -69,7 +69,7 @@ pub const ObjectMap = @import("json/dynamic.zig").ObjectMap; pub const Array = @import("json/dynamic.zig").Array; pub const Value = @import("json/dynamic.zig").Value; -pub const ArrayHashMapUnmanaged = @import("json/hashmap.zig").ArrayHashMapUnmanaged; +pub const ArrayHashMap = @import("json/hashmap.zig").ArrayHashMap; pub const validate = @import("json/scanner.zig").validate; pub const Error = @import("json/scanner.zig").Error; diff --git a/lib/std/json/hashmap.zig b/lib/std/json/hashmap.zig index 4fc3b785e9..320592589a 100644 --- a/lib/std/json/hashmap.zig +++ b/lib/std/json/hashmap.zig @@ -13,7 +13,7 @@ const encodeJsonString = @import("stringify.zig").encodeJsonString; /// `jsonParse`, `jsonParseFromValue`, and `jsonStringify`. /// This is useful when your JSON schema has an object with arbitrary data keys /// instead of comptime-known struct field names. -pub fn ArrayHashMapUnmanaged(comptime T: type) type { +pub fn ArrayHashMap(comptime T: type) type { return struct { map: std.StringArrayHashMapUnmanaged(T) = .{}, diff --git a/lib/std/json/hashmap_test.zig b/lib/std/json/hashmap_test.zig index 166179b865..3baead972a 100644 --- a/lib/std/json/hashmap_test.zig +++ b/lib/std/json/hashmap_test.zig @@ -1,7 +1,7 @@ const std = @import("std"); const testing = std.testing; -const ArrayHashMapUnmanaged = @import("hashmap.zig").ArrayHashMapUnmanaged; +const ArrayHashMap = @import("hashmap.zig").ArrayHashMap; const parseFromSlice = @import("static.zig").parseFromSlice; const parseFromSliceLeaky = @import("static.zig").parseFromSliceLeaky; @@ -21,7 +21,7 @@ test "parse json hashmap" { \\ "xyz": {"i": 1, "s": "w"} \\} ; - const parsed = try parseFromSlice(ArrayHashMapUnmanaged(T), testing.allocator, doc, .{}); + const parsed = try parseFromSlice(ArrayHashMap(T), testing.allocator, doc, .{}); defer parsed.deinit(); try testing.expectEqual(@as(usize, 2), parsed.value.map.count()); @@ -40,17 +40,17 @@ test "parse json hashmap duplicate fields" { \\} ; - try testing.expectError(error.DuplicateField, parseFromSliceLeaky(ArrayHashMapUnmanaged(T), arena.allocator(), doc, .{ + try testing.expectError(error.DuplicateField, parseFromSliceLeaky(ArrayHashMap(T), arena.allocator(), doc, .{ .duplicate_field_behavior = .@"error", })); - const first = try parseFromSliceLeaky(ArrayHashMapUnmanaged(T), arena.allocator(), doc, .{ + const first = try parseFromSliceLeaky(ArrayHashMap(T), arena.allocator(), doc, .{ .duplicate_field_behavior = .use_first, }); try testing.expectEqual(@as(usize, 1), first.map.count()); try testing.expectEqual(@as(i32, 0), first.map.get("abc").?.i); - const last = try parseFromSliceLeaky(ArrayHashMapUnmanaged(T), arena.allocator(), doc, .{ + const last = try parseFromSliceLeaky(ArrayHashMap(T), arena.allocator(), doc, .{ .duplicate_field_behavior = .use_last, }); try testing.expectEqual(@as(usize, 1), last.map.count()); @@ -58,7 +58,7 @@ test "parse json hashmap duplicate fields" { } test "stringify json hashmap" { - var value = ArrayHashMapUnmanaged(T){}; + var value = ArrayHashMap(T){}; defer value.deinit(testing.allocator); { const doc = try stringifyAlloc(testing.allocator, value, .{}); @@ -95,7 +95,7 @@ test "stringify json hashmap" { } test "stringify json hashmap whitespace" { - var value = ArrayHashMapUnmanaged(T){}; + var value = ArrayHashMap(T){}; defer value.deinit(testing.allocator); try value.map.put(testing.allocator, "abc", .{ .i = 0, .s = "d" }); try value.map.put(testing.allocator, "xyz", .{ .i = 1, .s = "w" }); @@ -132,7 +132,7 @@ test "json parse from value hashmap" { const parsed1 = try parseFromSlice(Value, testing.allocator, doc, .{}); defer parsed1.deinit(); - const parsed2 = try parseFromValue(ArrayHashMapUnmanaged(T), testing.allocator, parsed1.value, .{}); + const parsed2 = try parseFromValue(ArrayHashMap(T), testing.allocator, parsed1.value, .{}); defer parsed2.deinit(); try testing.expectEqualStrings("d", parsed2.value.map.get("abc").?.s);