mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-20 22:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

zon.stringify: Correctly serialize unions with void fields

Browse Source 
Closes #22933
This commit is contained in:
Nico Elbers 2025-02-18 18:25:46 +01:00 committed by Alex Rønne Petersen
parent 59dc15fa0a
commit 0cf6ae290b
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/std/zon/stringify.zig
View File

@ -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)) {
@ -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);
@ -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" {