From 253610f1769fc1be9d87ede7130a11321e2d2464 Mon Sep 17 00:00:00 2001 From: John <117967760+mochalins@users.noreply.github.com> Date: Sun, 1 Sep 2024 01:32:00 +0900 Subject: [PATCH] Handle `builtin` fields `error_set` rename Co-authored-by: Techatrix --- src/parser.zig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/parser.zig b/src/parser.zig index 0f23ae4..f7ec8c4 100644 --- a/src/parser.zig +++ b/src/parser.zig @@ -362,7 +362,10 @@ fn expectParseEqual(comptime T: type, comptime expected: anytype, s: []const u8) defer arena_allocator.deinit(); const arena = arena_allocator.allocator(); - if (@typeInfo(@TypeOf(expected)) != .error_set) { + const std_builtin_type_rename = comptime std.SemanticVersion.parse("0.14.0-dev.1346+31fef6f11") catch unreachable; + const error_set_tag = comptime if (@import("builtin").zig_version.order(std_builtin_type_rename) == .lt) .ErrorSet else .error_set; + + if (@typeInfo(@TypeOf(expected)) != error_set_tag) { const actual_from_slice = try std.json.parseFromSliceLeaky(T, arena, s, .{}); try std.testing.expectEqualDeep(@as(T, expected), actual_from_slice);