Skip to content

Zig master builtin type field changes #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 31, 2024
Merged

Zig master builtin type field changes #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55dadf1
fix: Update to work with Zig master
mochalins Aug 31, 2024
253610f
Handle `builtin` fields `error_set` rename
mochalins Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/parser.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ pub fn EnumCustomStringValues(comptime T: type, comptime contains_empty_enum: bo

const kvs = build_kvs: {
const KV = struct { []const u8, T };
const fields = @typeInfo(T).Union.fields;
const fields = std.meta.fields(T);
var kvs_array: [fields.len - 1]KV = undefined;
for (fields[0 .. fields.len - 1], &kvs_array) |field, *kv| {
if (contains_empty_enum and std.mem.eql(u8, field.name, "empty")) {
Expand Down Expand Up @@ -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)) != .ErrorSet) {
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);

Expand Down