authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-03-31 22:57:08-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-07-01 16:35:26-07:00
log31e0b5c3c76022daababd9065a9359343cf2b34f
tree51713be1e81ea138ec2c68b8108e514bbdaf64b8
parent57e1fc29d2728559928ae6f99ebe248c07f5ce18

fix merge conflicts

partially reapply b636d56d6a71b9ed521de7fccb519b7d0fa3db90

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

lib/std/zon/stringify.zig+7-1
...@@ -595,10 +595,16 @@ pub const Serializer = struct {...@@ -595,10 +595,16 @@ pub const Serializer = struct {
595 return self.writer.writeAll("inf");595 return self.writer.writeAll("inf");
596 } else if (std.math.isNegativeInf(val)) {596 } else if (std.math.isNegativeInf(val)) {
597 return self.writer.writeAll("-inf");597 return self.writer.writeAll("-inf");
598 } else if (std.math.isNegativeZero(val)) {
599 return self.writer.writeAll("-0.0");
600 } else {
601 try std.fmt.format(self.writer, "{d}", .{val});
602 },
603 .comptime_float => if (val == 0) {
604 return self.writer.writeAll("0");
598 } else {605 } else {
599 try std.fmt.format(self.writer, "{d}", .{val});606 try std.fmt.format(self.writer, "{d}", .{val});
600 },607 },
601 .comptime_float => try std.fmt.format(self.writer, "{d}", .{val}),
602 else => comptime unreachable,608 else => comptime unreachable,
603 }609 }
604 }610 }