authorgravatar for carl@astholm.seCarl Åstholm <carl@astholm.se> 2023-10-07 22:42:12+02:00
committergravatar for carl@astholm.seCarl Åstholm <carl@astholm.se> 2024-01-03 21:20:48+01:00
log4c1da0912a474228750362a11db85799cac311b9
tree36dad7e9e43856d0ec0b12d736c5133611d38e61
parente5994f5f573a51de4e604824355cac28b5ab4eba

Fix compile errors from the `expectEqual` change

7 files changed, 40 insertions(+), 38 deletions(-)

lib/std/math/float.zig+15-15
......@@ -138,11 +138,11 @@ test "math.inf" {
138138 const inf_u64: u64 = 0x7FF0000000000000;
139139 const inf_u80: u80 = 0x7FFF8000000000000000;
140140 const inf_u128: u128 = 0x7FFF0000000000000000000000000000;
141 try expectEqual(inf_u16, @bitCast(inf(f16)));
142 try expectEqual(inf_u32, @bitCast(inf(f32)));
143 try expectEqual(inf_u64, @bitCast(inf(f64)));
144 try expectEqual(inf_u80, @bitCast(inf(f80)));
145 try expectEqual(inf_u128, @bitCast(inf(f128)));
141 try expectEqual(inf_u16, @as(u16, @bitCast(inf(f16))));
142 try expectEqual(inf_u32, @as(u32, @bitCast(inf(f32))));
143 try expectEqual(inf_u64, @as(u64, @bitCast(inf(f64))));
144 try expectEqual(inf_u80, @as(u80, @bitCast(inf(f80))));
145 try expectEqual(inf_u128, @as(u128, @bitCast(inf(f128))));
146146}
147147
148148test "math.nan" {
......@@ -151,11 +151,11 @@ test "math.nan" {
151151 const qnan_u64: u64 = 0x7FF8000000000000;
152152 const qnan_u80: u80 = 0x7FFFC000000000000000;
153153 const qnan_u128: u128 = 0x7FFF8000000000000000000000000000;
154 try expectEqual(qnan_u16, @bitCast(nan(f16)));
155 try expectEqual(qnan_u32, @bitCast(nan(f32)));
156 try expectEqual(qnan_u64, @bitCast(nan(f64)));
157 try expectEqual(qnan_u80, @bitCast(nan(f80)));
158 try expectEqual(qnan_u128, @bitCast(nan(f128)));
154 try expectEqual(qnan_u16, @as(u16, @bitCast(nan(f16))));
155 try expectEqual(qnan_u32, @as(u32, @bitCast(nan(f32))));
156 try expectEqual(qnan_u64, @as(u64, @bitCast(nan(f64))));
157 try expectEqual(qnan_u80, @as(u80, @bitCast(nan(f80))));
158 try expectEqual(qnan_u128, @as(u128, @bitCast(nan(f128))));
159159}
160160
161161test "math.snan" {
......@@ -167,9 +167,9 @@ test "math.snan" {
167167 const snan_u64: u64 = 0x7FF4000000000000;
168168 const snan_u80: u80 = 0x7FFFA000000000000000;
169169 const snan_u128: u128 = 0x7FFF4000000000000000000000000000;
170 try expectEqual(snan_u16, @bitCast(snan(f16)));
171 try expectEqual(snan_u32, @bitCast(snan(f32)));
172 try expectEqual(snan_u64, @bitCast(snan(f64)));
173 try expectEqual(snan_u80, @bitCast(snan(f80)));
174 try expectEqual(snan_u128, @bitCast(snan(f128)));
170 try expectEqual(snan_u16, @as(u16, @bitCast(snan(f16))));
171 try expectEqual(snan_u32, @as(u32, @bitCast(snan(f32))));
172 try expectEqual(snan_u64, @as(u64, @bitCast(snan(f64))));
173 try expectEqual(snan_u80, @as(u80, @bitCast(snan(f80))));
174 try expectEqual(snan_u128, @as(u128, @bitCast(snan(f128))));
175175}
lib/std/mem.zig+6-4
......@@ -3262,7 +3262,7 @@ test "indexOfMax" {
32623262/// Finds the indices of the smallest and largest number in a slice. O(n).
32633263/// Returns an anonymous struct with the fields `index_min` and `index_max`.
32643264/// `slice` must not be empty.
3265pub fn indexOfMinMax(comptime T: type, slice: []const T) struct { index_min: usize, index_max: usize } {
3265pub fn indexOfMinMax(comptime T: type, slice: []const T) IndexOfMinMaxResult {
32663266 assert(slice.len > 0);
32673267 var minVal = slice[0];
32683268 var maxVal = slice[0];
......@@ -3281,10 +3281,12 @@ pub fn indexOfMinMax(comptime T: type, slice: []const T) struct { index_min: usi
32813281 return .{ .index_min = minIdx, .index_max = maxIdx };
32823282}
32833283
3284pub const IndexOfMinMaxResult = struct { index_min: usize, index_max: usize };
3285
32843286test "indexOfMinMax" {
3285 try testing.expectEqual(indexOfMinMax(u8, "abcdefg"), .{ .index_min = 0, .index_max = 6 });
3286 try testing.expectEqual(indexOfMinMax(u8, "gabcdef"), .{ .index_min = 1, .index_max = 0 });
3287 try testing.expectEqual(indexOfMinMax(u8, "a"), .{ .index_min = 0, .index_max = 0 });
3287 try testing.expectEqual(indexOfMinMax(u8, "abcdefg"), IndexOfMinMaxResult{ .index_min = 0, .index_max = 6 });
3288 try testing.expectEqual(indexOfMinMax(u8, "gabcdef"), IndexOfMinMaxResult{ .index_min = 1, .index_max = 0 });
3289 try testing.expectEqual(indexOfMinMax(u8, "a"), IndexOfMinMaxResult{ .index_min = 0, .index_max = 0 });
32883290}
32893291
32903292pub fn swap(comptime T: type, a: *T, b: *T) void {
lib/std/multi_array_list.zig+12-12
......@@ -842,24 +842,24 @@ test "union" {
842842 &.{ .a, .b, .b, .a, .a, .a, .a, .a, .a },
843843 list.items(.tags),
844844 );
845 try testing.expectEqual(list.get(0), .{ .a = 1 });
846 try testing.expectEqual(list.get(1), .{ .b = "zigzag" });
847 try testing.expectEqual(list.get(2), .{ .b = "foobar" });
848 try testing.expectEqual(list.get(3), .{ .a = 4 });
849 try testing.expectEqual(list.get(4), .{ .a = 5 });
850 try testing.expectEqual(list.get(5), .{ .a = 6 });
851 try testing.expectEqual(list.get(6), .{ .a = 7 });
852 try testing.expectEqual(list.get(7), .{ .a = 8 });
853 try testing.expectEqual(list.get(8), .{ .a = 9 });
845 try testing.expectEqual(list.get(0), Foo{ .a = 1 });
846 try testing.expectEqual(list.get(1), Foo{ .b = "zigzag" });
847 try testing.expectEqual(list.get(2), Foo{ .b = "foobar" });
848 try testing.expectEqual(list.get(3), Foo{ .a = 4 });
849 try testing.expectEqual(list.get(4), Foo{ .a = 5 });
850 try testing.expectEqual(list.get(5), Foo{ .a = 6 });
851 try testing.expectEqual(list.get(6), Foo{ .a = 7 });
852 try testing.expectEqual(list.get(7), Foo{ .a = 8 });
853 try testing.expectEqual(list.get(8), Foo{ .a = 9 });
854854
855855 list.shrinkAndFree(ally, 3);
856856
857857 try testing.expectEqual(@as(usize, 3), list.items(.tags).len);
858858 try testing.expectEqualSlices(meta.Tag(Foo), list.items(.tags), &.{ .a, .b, .b });
859859
860 try testing.expectEqual(list.get(0), .{ .a = 1 });
861 try testing.expectEqual(list.get(1), .{ .b = "zigzag" });
862 try testing.expectEqual(list.get(2), .{ .b = "foobar" });
860 try testing.expectEqual(list.get(0), Foo{ .a = 1 });
861 try testing.expectEqual(list.get(1), Foo{ .b = "zigzag" });
862 try testing.expectEqual(list.get(2), Foo{ .b = "foobar" });
863863}
864864
865865test "sorting a span" {
test/behavior/cast.zig+1-1
......@@ -1156,7 +1156,7 @@ test "cast function with an opaque parameter" {
11561156 .func = @ptrCast(&Foo.funcImpl),
11571157 };
11581158 c.func(c.ctx);
1159 try std.testing.expectEqual(foo, .{ .x = 101, .y = 201 });
1159 try std.testing.expectEqual(foo, Foo{ .x = 101, .y = 201 });
11601160}
11611161
11621162test "implicit ptr to *anyopaque" {
test/behavior/packed-struct.zig+1-1
......@@ -1033,7 +1033,7 @@ test "modify nested packed struct aligned field" {
10331033
10341034 var opts = Options{};
10351035 opts.pretty_print.indent += 1;
1036 try std.testing.expectEqual(@as(u17, 0b00000000100100000), @bitCast(opts));
1036 try std.testing.expectEqual(@as(u17, 0b00000000100100000), @as(u17, @bitCast(opts)));
10371037 try std.testing.expect(!opts.foo);
10381038 try std.testing.expect(!opts.bar);
10391039 try std.testing.expect(!opts.pretty_print.enabled);
test/behavior/type.zig+2-2
......@@ -438,9 +438,9 @@ test "Type.Union" {
438438 },
439439 });
440440 var tagged = Tagged{ .signed = -1 };
441 try testing.expectEqual(Tag.signed, tagged);
441 try testing.expectEqual(Tag.signed, @as(Tag, tagged));
442442 tagged = .{ .unsigned = 1 };
443 try testing.expectEqual(Tag.unsigned, tagged);
443 try testing.expectEqual(Tag.unsigned, @as(Tag, tagged));
444444}
445445
446446test "Type.Union from Type.Enum" {
test/c_abi/main.zig+3-3
......@@ -946,7 +946,7 @@ test "DC: C returns to Zig" {
946946 if (comptime builtin.cpu.arch.isRISCV()) return error.SkipZigTest;
947947 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
948948 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
949 try expectEqual(c_ret_DC(), .{ .v1 = -0.25, .v2 = 15 });
949 try expectEqual(c_ret_DC(), DC{ .v1 = -0.25, .v2 = 15 });
950950}
951951
952952pub extern fn c_assert_DC(lv: DC) c_int;
......@@ -998,7 +998,7 @@ test "CFF: C returns to Zig" {
998998 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;
999999 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
10001000 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
1001 try expectEqual(c_ret_CFF(), .{ .v1 = 39, .v2 = 0.875, .v3 = 1.0 });
1001 try expectEqual(c_ret_CFF(), CFF{ .v1 = 39, .v2 = 0.875, .v3 = 1.0 });
10021002}
10031003pub extern fn c_assert_CFF(lv: CFF) c_int;
10041004pub extern fn c_assert_ret_CFF() c_int;
......@@ -1045,7 +1045,7 @@ test "PD: C returns to Zig" {
10451045 if (comptime builtin.cpu.arch.isMIPS() and builtin.mode != .Debug) return error.SkipZigTest;
10461046 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
10471047 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
1048 try expectEqual(c_ret_PD(), .{ .v1 = null, .v2 = 0.5 });
1048 try expectEqual(c_ret_PD(), PD{ .v1 = null, .v2 = 0.5 });
10491049}
10501050pub extern fn c_assert_PD(lv: PD) c_int;
10511051pub extern fn c_assert_ret_PD() c_int;