From e496485af4fe998a80564082fd7ea4556ed549e1 Mon Sep 17 00:00:00 2001 From: Kate Tsuyu Date: Sat, 29 Aug 2020 03:07:36 -0400 Subject: [PATCH] std.math.divCeil: fix expectEqual argument order --- lib/std/math.zig | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/std/math.zig b/lib/std/math.zig index 653df13ee0..e815bec61c 100644 --- a/lib/std/math.zig +++ b/lib/std/math.zig @@ -646,31 +646,31 @@ test "math.divCeil" { comptime testDivCeil(); } fn testDivCeil() void { - testing.expectEqual(divCeil(i32, 5, 3) catch unreachable, 2); - testing.expectEqual(divCeil(i32, -5, 3) catch unreachable, -1); - testing.expectEqual(divCeil(i32, 5, -3) catch unreachable, -1); - testing.expectEqual(divCeil(i32, -5, -3) catch unreachable, 2); - testing.expectEqual(divCeil(i32, 0, 5) catch unreachable, 0); - testing.expectEqual(divCeil(u32, 0, 5) catch unreachable, 0); + testing.expectEqual(@as(i32, 2), divCeil(i32, 5, 3) catch unreachable); + testing.expectEqual(@as(i32, -1), divCeil(i32, -5, 3) catch unreachable); + testing.expectEqual(@as(i32, -1), divCeil(i32, 5, -3) catch unreachable); + testing.expectEqual(@as(i32, 2), divCeil(i32, -5, -3) catch unreachable); + testing.expectEqual(@as(i32, 0), divCeil(i32, 0, 5) catch unreachable); + testing.expectEqual(@as(u32, 0), divCeil(u32, 0, 5) catch unreachable); testing.expectError(error.DivisionByZero, divCeil(i8, -5, 0)); testing.expectError(error.Overflow, divCeil(i8, -128, -1)); - testing.expectEqual(divCeil(f32, 0.0, 5.0) catch unreachable, 0.0); - testing.expectEqual(divCeil(f32, 5.0, 3.0) catch unreachable, 2.0); - testing.expectEqual(divCeil(f32, -5.0, 3.0) catch unreachable, -1.0); - testing.expectEqual(divCeil(f32, 5.0, -3.0) catch unreachable, -1.0); - testing.expectEqual(divCeil(f32, -5.0, -3.0) catch unreachable, 2.0); + testing.expectEqual(@as(f32, 0.0), divCeil(f32, 0.0, 5.0) catch unreachable); + testing.expectEqual(@as(f32, 2.0), divCeil(f32, 5.0, 3.0) catch unreachable); + testing.expectEqual(@as(f32, -1.0), divCeil(f32, -5.0, 3.0) catch unreachable); + testing.expectEqual(@as(f32, -1.0), divCeil(f32, 5.0, -3.0) catch unreachable); + testing.expectEqual(@as(f32, 2.0), divCeil(f32, -5.0, -3.0) catch unreachable); - testing.expectEqual(divCeil(comptime_int, 23, 4) catch unreachable, 6); - testing.expectEqual(divCeil(comptime_int, -23, 4) catch unreachable, -5); - testing.expectEqual(divCeil(comptime_int, 23, -4) catch unreachable, -5); - testing.expectEqual(divCeil(comptime_int, -23, -4) catch unreachable, 6); + testing.expectEqual(6, divCeil(comptime_int, 23, 4) catch unreachable); + testing.expectEqual(-5, divCeil(comptime_int, -23, 4) catch unreachable); + testing.expectEqual(-5, divCeil(comptime_int, 23, -4) catch unreachable); + testing.expectEqual(6, divCeil(comptime_int, -23, -4) catch unreachable); testing.expectError(error.DivisionByZero, divCeil(comptime_int, 23, 0)); - testing.expectEqual(divCeil(comptime_float, 23.0, 4.0) catch unreachable, 6.0); - testing.expectEqual(divCeil(comptime_float, -23.0, 4.0) catch unreachable, -5.0); - testing.expectEqual(divCeil(comptime_float, 23.0, -4.0) catch unreachable, -5.0); - testing.expectEqual(divCeil(comptime_float, -23.0, -4.0) catch unreachable, 6.0); + testing.expectEqual(6.0, divCeil(comptime_float, 23.0, 4.0) catch unreachable); + testing.expectEqual(-5.0, divCeil(comptime_float, -23.0, 4.0) catch unreachable); + testing.expectEqual(-5.0, divCeil(comptime_float, 23.0, -4.0) catch unreachable); + testing.expectEqual(6.0, divCeil(comptime_float, -23.0, -4.0) catch unreachable); testing.expectError(error.DivisionByZero, divCeil(comptime_float, 23.0, 0.0)); }