Commit d34201c8491007c5a24b4175a5170a5b6cc3d55e | zig

author	Philipp Lühmann <philipp@luehmann.dev> 2023-08-09 01:26:46+02:00
committer	GitHub <noreply@github.com> 2023-08-08 23:26:46+00:00
log	d34201c8491007c5a24b4175a5170a5b6cc3d55e
tree	b1c5f230c9b143902acc17627b6e60a940cecc2e
parent	36c57c3ba17c45a4c9b902041db9bb993dbc67b9
signature	Signed by PGP key 4AEE18F83AFDEB23

std.json: stringify enum literals (#16742)

2 files changed, 7 insertions(+), 1 deletions(-)

lib
- std
  - json
    stringify.zig
    stringify_test.zig

lib/std/json/stringify.zig+2-1

...	@@ -181,6 +181,7 @@ pub fn writeStreamArbitraryDepth(	...	@@ -181,6 +181,7 @@ pub fn writeStreamArbitraryDepth(
181	/// * If the union declares a method `pub fn jsonStringify(self: *@This(), jw: anytype) !void`, it is called to do the serialization instead of the default behavior. The given `jw` is a pointer to this `WriteStream`.	181	/// * If the union declares a method `pub fn jsonStringify(self: *@This(), jw: anytype) !void`, it is called to do the serialization instead of the default behavior. The given `jw` is a pointer to this `WriteStream`.
182	/// * Zig `enum` -> JSON string naming the active tag.	182	/// * Zig `enum` -> JSON string naming the active tag.
183	/// * If the enum declares a method `pub fn jsonStringify(self: *@This(), jw: anytype) !void`, it is called to do the serialization instead of the default behavior. The given `jw` is a pointer to this `WriteStream`.	183	/// * If the enum declares a method `pub fn jsonStringify(self: *@This(), jw: anytype) !void`, it is called to do the serialization instead of the default behavior. The given `jw` is a pointer to this `WriteStream`.
		184	/// * Zig untyped enum literal -> JSON string naming the active tag.
184	/// * Zig error -> JSON string naming the error.	185	/// * Zig error -> JSON string naming the error.
185	/// * Zig `*T` -> the rendering of `T`. Note there is no guard against circular-reference infinite recursion.	186	/// * Zig `*T` -> the rendering of `T`. Note there is no guard against circular-reference infinite recursion.
186	///	187	///
...	@@ -449,7 +450,7 @@ pub fn WriteStream(	...	@@ -449,7 +450,7 @@ pub fn WriteStream(
449	return try self.write(null);	450	return try self.write(null);
450	}	451	}
451	},	452	},
452	.Enum => {	453	.Enum, .EnumLiteral => {
453	if (comptime std.meta.trait.hasFn("jsonStringify")(T)) {	454	if (comptime std.meta.trait.hasFn("jsonStringify")(T)) {
454	return value.jsonStringify(self);	455	return value.jsonStringify(self);
455	}	456	}

lib/std/json/stringify_test.zig+5

 @@ -172,6 +172,11 @@ test "stringify enums" {
     try testStringify("\"bar\"", E.bar, .{});
 }
+test "stringify enum literals" {
+    try testStringify("\"foo\"", .foo, .{});
+    try testStringify("\"bar\"", .bar, .{});
+}
 test "stringify tagged unions" {
     const T = union(enum) {
         nothing,