Skip to content

zon.stringify: Correctly serialize unions with void fields #22935

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 1 commit into from
Feb 19, 2025
Merged

zon.stringify: Correctly serialize unions with void fields #22935

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 19 additions & 8 deletions lib/std/zon/stringify.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,6 @@ pub fn Serializer(Writer: type) type {
.bool, .null => try std.fmt.format(self.writer, "{}", .{val}),
.enum_literal => try self.ident(@tagName(val)),
.@"enum" => try self.ident(@tagName(val)),
.void => try self.writer.writeAll("{}"),
.pointer => |pointer| {
// Try to serialize as a string
const item: ?type = switch (@typeInfo(pointer.child)) {
Expand Down Expand Up @@ -579,15 +578,21 @@ pub fn Serializer(Writer: type) type {
},
.@"union" => |@"union"| {
comptime assert(@"union".tag_type != null);
var container = try self.startStruct(.{ .whitespace_style = .{ .fields = 1 } });
switch (val) {
inline else => |pl, tag| try container.fieldArbitraryDepth(
@tagName(tag),
pl,
options,
),
inline else => |pl, tag| if (@TypeOf(pl) == void)
try self.writer.print(".{s}", .{@tagName(tag)})
else {
var container = try self.startStruct(.{ .whitespace_style = .{ .fields = 1 } });

try container.fieldArbitraryDepth(
@tagName(tag),
pl,
options,
);

try container.finish();
},
}
try container.finish();
},
.optional => if (val) |inner| {
try self.valueArbitraryDepth(inner, options);
Expand Down Expand Up @@ -1116,6 +1121,12 @@ test "std.zon stringify whitespace, high level API" {
\\ 3,
\\} }
, .{ .inner = .{ 1, 2, 3 } }, .{});

const UnionWithVoid = union(enum) { a, b: void, c: u8 };

try expectSerializeEqual(
\\.a
, UnionWithVoid.a, .{});
}

test "std.zon stringify whitespace, low level API" {
Expand Down
Loading