From 31e0b5c3c76022daababd9065a9359343cf2b34f Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 31 Mar 2025 22:57:08 -0700 Subject: [PATCH] fix merge conflicts partially reapply b636d56d6a71b9ed521de7fccb519b7d0fa3db90 --- lib/std/zon/stringify.zig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/std/zon/stringify.zig b/lib/std/zon/stringify.zig index ea1e298f9a..5836098c63 100644 --- a/lib/std/zon/stringify.zig +++ b/lib/std/zon/stringify.zig @@ -595,10 +595,16 @@ pub const Serializer = struct { return self.writer.writeAll("inf"); } else if (std.math.isNegativeInf(val)) { return self.writer.writeAll("-inf"); + } else if (std.math.isNegativeZero(val)) { + return self.writer.writeAll("-0.0"); + } else { + try std.fmt.format(self.writer, "{d}", .{val}); + }, + .comptime_float => if (val == 0) { + return self.writer.writeAll("0"); } else { try std.fmt.format(self.writer, "{d}", .{val}); }, - .comptime_float => try std.fmt.format(self.writer, "{d}", .{val}), else => comptime unreachable, } }