From 073f7ebb0e2168d04212fd855235c3543f86a2be Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 20 Sep 2018 13:46:20 -0400 Subject: [PATCH] fix formatInt to handle upcasting to base int size --- std/fmt/index.zig | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/std/fmt/index.zig b/std/fmt/index.zig index 14c944e9d5..b91699da43 100644 --- a/std/fmt/index.zig +++ b/std/fmt/index.zig @@ -723,7 +723,9 @@ fn formatIntUnsigned( // max_int_digits accounts for the minus sign. when printing an unsigned // number we don't need to do that. var buf: [max_int_digits - 1]u8 = undefined; - var a = if (@sizeOf(@typeOf(value)) == 1) u8(value) else value; + const min_int_bits = comptime math.max(@typeOf(value).bit_count, @typeOf(base).bit_count); + const MinInt = @IntType(@typeOf(value).is_signed, min_int_bits); + var a: MinInt = value; var index: usize = buf.len; while (true) { @@ -965,6 +967,14 @@ test "fmt.format" { try testFmt("struct: Struct{ .field = 42 }\n", "struct: {}\n", value); try testFmt("struct: Struct{ .field = 42 }\n", "struct: {}\n", &value); } + { + const Struct = struct { + a: u0, + b: u1, + }; + const value = Struct{ .a = 0, .b = 1 }; + try testFmt("struct: Struct{ .a = 0, .b = 1 }\n", "struct: {}\n", value); + } { const Enum = enum { One,