update usage of std.testing in stage2

Author: Vexu

src/Cache.zig

@@ -727,7 +727,7 @@ test "cache file and then recall it" {
             _ = try ch.addFile(temp_file, null);
 
             // There should be nothing in the cache
-            testing.expectEqual(false, try ch.hit());
+            try testing.expectEqual(false, try ch.hit());
 
             digest1 = ch.final();
             try ch.writeManifest();
@@ -742,13 +742,13 @@ test "cache file and then recall it" {
             _ = try ch.addFile(temp_file, null);
 
             // Cache hit! We just "built" the same file
-            testing.expect(try ch.hit());
+            try testing.expect(try ch.hit());
             digest2 = ch.final();
 
             try ch.writeManifest();
         }
 
-        testing.expectEqual(digest1, digest2);
+        try testing.expectEqual(digest1, digest2);
     }
 
     try cwd.deleteTree(temp_manifest_dir);
@@ -760,11 +760,11 @@ test "give problematic timestamp" {
     // to make it problematic, we make it only accurate to the second
     fs_clock = @divTrunc(fs_clock, std.time.ns_per_s);
     fs_clock *= std.time.ns_per_s;
-    testing.expect(isProblematicTimestamp(fs_clock));
+    try testing.expect(isProblematicTimestamp(fs_clock));
 }
 
 test "give nonproblematic timestamp" {
-    testing.expect(!isProblematicTimestamp(std.time.nanoTimestamp() - std.time.ns_per_s));
+    try testing.expect(!isProblematicTimestamp(std.time.nanoTimestamp() - std.time.ns_per_s));
 }
 
 test "check that changing a file makes cache fail" {
@@ -807,9 +807,9 @@ test "check that changing a file makes cache fail" {
             const temp_file_idx = try ch.addFile(temp_file, 100);
 
             // There should be nothing in the cache
-            testing.expectEqual(false, try ch.hit());
+            try testing.expectEqual(false, try ch.hit());
 
-            testing.expect(mem.eql(u8, original_temp_file_contents, ch.files.items[temp_file_idx].contents.?));
+            try testing.expect(mem.eql(u8, original_temp_file_contents, ch.files.items[temp_file_idx].contents.?));
 
             digest1 = ch.final();
 
@@ -826,17 +826,17 @@ test "check that changing a file makes cache fail" {
             const temp_file_idx = try ch.addFile(temp_file, 100);
 
             // A file that we depend on has been updated, so the cache should not contain an entry for it
-            testing.expectEqual(false, try ch.hit());
+            try testing.expectEqual(false, try ch.hit());
 
             // The cache system does not keep the contents of re-hashed input files.
-            testing.expect(ch.files.items[temp_file_idx].contents == null);
+            try testing.expect(ch.files.items[temp_file_idx].contents == null);
 
             digest2 = ch.final();
 
             try ch.writeManifest();
         }
 
-        testing.expect(!mem.eql(u8, digest1[0..], digest2[0..]));
+        try testing.expect(!mem.eql(u8, digest1[0..], digest2[0..]));
     }
 
     try cwd.deleteTree(temp_manifest_dir);
@@ -868,7 +868,7 @@ test "no file inputs" {
         ch.hash.addBytes("1234");
 
         // There should be nothing in the cache
-        testing.expectEqual(false, try ch.hit());
+        try testing.expectEqual(false, try ch.hit());
 
         digest1 = ch.final();
 
@@ -880,12 +880,12 @@ test "no file inputs" {
 
         ch.hash.addBytes("1234");
 
-        testing.expect(try ch.hit());
+        try testing.expect(try ch.hit());
         digest2 = ch.final();
         try ch.writeManifest();
     }
 
-    testing.expectEqual(digest1, digest2);
+    try testing.expectEqual(digest1, digest2);
 }
 
 test "Manifest with files added after initial hash work" {
@@ -926,7 +926,7 @@ test "Manifest with files added after initial hash work" {
             _ = try ch.addFile(temp_file1, null);
 
             // There should be nothing in the cache
-            testing.expectEqual(false, try ch.hit());
+            try testing.expectEqual(false, try ch.hit());
 
             _ = try ch.addFilePost(temp_file2);
 
@@ -940,12 +940,12 @@ test "Manifest with files added after initial hash work" {
             ch.hash.addBytes("1234");
             _ = try ch.addFile(temp_file1, null);
 
-            testing.expect(try ch.hit());
+            try testing.expect(try ch.hit());
             digest2 = ch.final();
 
             try ch.writeManifest();
         }
-        testing.expect(mem.eql(u8, &digest1, &digest2));
+        try testing.expect(mem.eql(u8, &digest1, &digest2));
 
         // Modify the file added after initial hash
         const ts2 = std.time.nanoTimestamp();
@@ -963,7 +963,7 @@ test "Manifest with files added after initial hash work" {
             _ = try ch.addFile(temp_file1, null);
 
             // A file that we depend on has been updated, so the cache should not contain an entry for it
-            testing.expectEqual(false, try ch.hit());
+            try testing.expectEqual(false, try ch.hit());
 
             _ = try ch.addFilePost(temp_file2);
 
@@ -972,7 +972,7 @@ test "Manifest with files added after initial hash work" {
             try ch.writeManifest();
         }
 
-        testing.expect(!mem.eql(u8, &digest1, &digest3));
+        try testing.expect(!mem.eql(u8, &digest1, &digest3));
     }
 
     try cwd.deleteTree(temp_manifest_dir);

src/Compilation.zig

@@ -2853,14 +2853,14 @@ pub fn classifyFileExt(filename: []const u8) FileExt {
 }
 
 test "classifyFileExt" {
-    std.testing.expectEqual(FileExt.cpp, classifyFileExt("foo.cc"));
-    std.testing.expectEqual(FileExt.unknown, classifyFileExt("foo.nim"));
-    std.testing.expectEqual(FileExt.shared_library, classifyFileExt("foo.so"));
-    std.testing.expectEqual(FileExt.shared_library, classifyFileExt("foo.so.1"));
-    std.testing.expectEqual(FileExt.shared_library, classifyFileExt("foo.so.1.2"));
-    std.testing.expectEqual(FileExt.shared_library, classifyFileExt("foo.so.1.2.3"));
-    std.testing.expectEqual(FileExt.unknown, classifyFileExt("foo.so.1.2.3~"));
-    std.testing.expectEqual(FileExt.zig, classifyFileExt("foo.zig"));
+    try std.testing.expectEqual(FileExt.cpp, classifyFileExt("foo.cc"));
+    try std.testing.expectEqual(FileExt.unknown, classifyFileExt("foo.nim"));
+    try std.testing.expectEqual(FileExt.shared_library, classifyFileExt("foo.so"));
+    try std.testing.expectEqual(FileExt.shared_library, classifyFileExt("foo.so.1"));
+    try std.testing.expectEqual(FileExt.shared_library, classifyFileExt("foo.so.1.2"));
+    try std.testing.expectEqual(FileExt.shared_library, classifyFileExt("foo.so.1.2.3"));
+    try std.testing.expectEqual(FileExt.unknown, classifyFileExt("foo.so.1.2.3~"));
+    try std.testing.expectEqual(FileExt.zig, classifyFileExt("foo.zig"));
 }
 
 fn haveFramePointer(comp: *const Compilation) bool {

src/DepTokenizer.zig

@@ -918,7 +918,7 @@ fn depTokenizer(input: []const u8, expect: []const u8) !void {
     }
 
     if (std.mem.eql(u8, expect, buffer.items)) {
-        testing.expect(true);
+        try testing.expect(true);
         return;
     }
 
@@ -930,7 +930,7 @@ fn depTokenizer(input: []const u8, expect: []const u8) !void {
     try printSection(out, ">>>> got", buffer.items);
     try printRuler(out);
 
-    testing.expect(false);
+    try testing.expect(false);
 }
 
 fn printSection(out: anytype, label: []const u8, bytes: []const u8) !void {

src/codegen/aarch64.zig

@@ -67,27 +67,27 @@ pub const c_abi_int_param_regs = [_]Register{ .x0, .x1, .x2, .x3, .x4, .x5, .x6,
 pub const c_abi_int_return_regs = [_]Register{ .x0, .x1, .x2, .x3, .x4, .x5, .x6, .x7 };
 
 test "Register.id" {
-    testing.expectEqual(@as(u5, 0), Register.x0.id());
-    testing.expectEqual(@as(u5, 0), Register.w0.id());
+    try testing.expectEqual(@as(u5, 0), Register.x0.id());
+    try testing.expectEqual(@as(u5, 0), Register.w0.id());
 
-    testing.expectEqual(@as(u5, 31), Register.xzr.id());
-    testing.expectEqual(@as(u5, 31), Register.wzr.id());
+    try testing.expectEqual(@as(u5, 31), Register.xzr.id());
+    try testing.expectEqual(@as(u5, 31), Register.wzr.id());
 
-    testing.expectEqual(@as(u5, 31), Register.sp.id());
-    testing.expectEqual(@as(u5, 31), Register.sp.id());
+    try testing.expectEqual(@as(u5, 31), Register.sp.id());
+    try testing.expectEqual(@as(u5, 31), Register.sp.id());
 }
 
 test "Register.size" {
-    testing.expectEqual(@as(u7, 64), Register.x19.size());
-    testing.expectEqual(@as(u7, 32), Register.w3.size());
+    try testing.expectEqual(@as(u7, 64), Register.x19.size());
+    try testing.expectEqual(@as(u7, 32), Register.w3.size());
 }
 
 test "Register.to64/to32" {
-    testing.expectEqual(Register.x0, Register.w0.to64());
-    testing.expectEqual(Register.x0, Register.x0.to64());
+    try testing.expectEqual(Register.x0, Register.w0.to64());
+    try testing.expectEqual(Register.x0, Register.x0.to64());
 
-    testing.expectEqual(Register.w3, Register.w3.to32());
-    testing.expectEqual(Register.w3, Register.x3.to32());
+    try testing.expectEqual(Register.w3, Register.w3.to32());
+    try testing.expectEqual(Register.w3, Register.x3.to32());
 }
 
 // zig fmt: off
@@ -169,33 +169,33 @@ pub const FloatingPointRegister = enum(u8) {
 // zig fmt: on
 
 test "FloatingPointRegister.id" {
-    testing.expectEqual(@as(u5, 0), FloatingPointRegister.b0.id());
-    testing.expectEqual(@as(u5, 0), FloatingPointRegister.h0.id());
-    testing.expectEqual(@as(u5, 0), FloatingPointRegister.s0.id());
-    testing.expectEqual(@as(u5, 0), FloatingPointRegister.d0.id());
-    testing.expectEqual(@as(u5, 0), FloatingPointRegister.q0.id());
-
-    testing.expectEqual(@as(u5, 2), FloatingPointRegister.q2.id());
-    testing.expectEqual(@as(u5, 31), FloatingPointRegister.d31.id());
+    try testing.expectEqual(@as(u5, 0), FloatingPointRegister.b0.id());
+    try testing.expectEqual(@as(u5, 0), FloatingPointRegister.h0.id());
+    try testing.expectEqual(@as(u5, 0), FloatingPointRegister.s0.id());
+    try testing.expectEqual(@as(u5, 0), FloatingPointRegister.d0.id());
+    try testing.expectEqual(@as(u5, 0), FloatingPointRegister.q0.id());
+
+    try testing.expectEqual(@as(u5, 2), FloatingPointRegister.q2.id());
+    try testing.expectEqual(@as(u5, 31), FloatingPointRegister.d31.id());
 }
 
 test "FloatingPointRegister.size" {
-    testing.expectEqual(@as(u8, 128), FloatingPointRegister.q1.size());
-    testing.expectEqual(@as(u8, 64), FloatingPointRegister.d2.size());
-    testing.expectEqual(@as(u8, 32), FloatingPointRegister.s3.size());
-    testing.expectEqual(@as(u8, 16), FloatingPointRegister.h4.size());
-    testing.expectEqual(@as(u8, 8), FloatingPointRegister.b5.size());
+    try testing.expectEqual(@as(u8, 128), FloatingPointRegister.q1.size());
+    try testing.expectEqual(@as(u8, 64), FloatingPointRegister.d2.size());
+    try testing.expectEqual(@as(u8, 32), FloatingPointRegister.s3.size());
+    try testing.expectEqual(@as(u8, 16), FloatingPointRegister.h4.size());
+    try testing.expectEqual(@as(u8, 8), FloatingPointRegister.b5.size());
 }
 
 test "FloatingPointRegister.toX" {
-    testing.expectEqual(FloatingPointRegister.q1, FloatingPointRegister.q1.to128());
-    testing.expectEqual(FloatingPointRegister.q2, FloatingPointRegister.b2.to128());
-    testing.expectEqual(FloatingPointRegister.q3, FloatingPointRegister.h3.to128());
-
-    testing.expectEqual(FloatingPointRegister.d0, FloatingPointRegister.q0.to64());
-    testing.expectEqual(FloatingPointRegister.s1, FloatingPointRegister.d1.to32());
-    testing.expectEqual(FloatingPointRegister.h2, FloatingPointRegister.s2.to16());
-    testing.expectEqual(FloatingPointRegister.b3, FloatingPointRegister.h3.to8());
+    try testing.expectEqual(FloatingPointRegister.q1, FloatingPointRegister.q1.to128());
+    try testing.expectEqual(FloatingPointRegister.q2, FloatingPointRegister.b2.to128());
+    try testing.expectEqual(FloatingPointRegister.q3, FloatingPointRegister.h3.to128());
+
+    try testing.expectEqual(FloatingPointRegister.d0, FloatingPointRegister.q0.to64());
+    try testing.expectEqual(FloatingPointRegister.s1, FloatingPointRegister.d1.to32());
+    try testing.expectEqual(FloatingPointRegister.h2, FloatingPointRegister.s2.to16());
+    try testing.expectEqual(FloatingPointRegister.b3, FloatingPointRegister.h3.to8());
 }
 
 /// Represents an instruction in the AArch64 instruction set
@@ -1225,6 +1225,6 @@ test "serialize instructions" {
 
     for (testcases) |case| {
         const actual = case.inst.toU32();
-        testing.expectEqual(case.expected, actual);
+        try testing.expectEqual(case.expected, actual);
     }
 }

src/codegen/arm.zig

@@ -88,19 +88,19 @@ pub const Condition = enum(u4) {
 };
 
 test "condition from CompareOperator" {
-    testing.expectEqual(@as(Condition, .eq), Condition.fromCompareOperatorSigned(.eq));
-    testing.expectEqual(@as(Condition, .eq), Condition.fromCompareOperatorUnsigned(.eq));
+    try testing.expectEqual(@as(Condition, .eq), Condition.fromCompareOperatorSigned(.eq));
+    try testing.expectEqual(@as(Condition, .eq), Condition.fromCompareOperatorUnsigned(.eq));
 
-    testing.expectEqual(@as(Condition, .gt), Condition.fromCompareOperatorSigned(.gt));
-    testing.expectEqual(@as(Condition, .hi), Condition.fromCompareOperatorUnsigned(.gt));
+    try testing.expectEqual(@as(Condition, .gt), Condition.fromCompareOperatorSigned(.gt));
+    try testing.expectEqual(@as(Condition, .hi), Condition.fromCompareOperatorUnsigned(.gt));
 
-    testing.expectEqual(@as(Condition, .le), Condition.fromCompareOperatorSigned(.lte));
-    testing.expectEqual(@as(Condition, .ls), Condition.fromCompareOperatorUnsigned(.lte));
+    try testing.expectEqual(@as(Condition, .le), Condition.fromCompareOperatorSigned(.lte));
+    try testing.expectEqual(@as(Condition, .ls), Condition.fromCompareOperatorUnsigned(.lte));
 }
 
 test "negate condition" {
-    testing.expectEqual(@as(Condition, .eq), Condition.ne.negate());
-    testing.expectEqual(@as(Condition, .ne), Condition.eq.negate());
+    try testing.expectEqual(@as(Condition, .eq), Condition.ne.negate());
+    try testing.expectEqual(@as(Condition, .ne), Condition.eq.negate());
 }
 
 /// Represents a register in the ARM instruction set architecture
@@ -175,8 +175,8 @@ pub const Register = enum(u5) {
 };
 
 test "Register.id" {
-    testing.expectEqual(@as(u4, 15), Register.r15.id());
-    testing.expectEqual(@as(u4, 15), Register.pc.id());
+    try testing.expectEqual(@as(u4, 15), Register.r15.id());
+    try testing.expectEqual(@as(u4, 15), Register.pc.id());
 }
 
 /// Program status registers containing flags, mode bits and other
@@ -1225,7 +1225,7 @@ test "serialize instructions" {
 
     for (testcases) |case| {
         const actual = case.inst.toU32();
-        testing.expectEqual(case.expected, actual);
+        try testing.expectEqual(case.expected, actual);
     }
 }
 
@@ -1265,6 +1265,6 @@ test "aliases" {
     };
 
     for (testcases) |case| {
-        testing.expectEqual(case.expected.toU32(), case.actual.toU32());
+        try testing.expectEqual(case.expected.toU32(), case.actual.toU32());
     }
 }

src/codegen/riscv64.zig

@@ -465,6 +465,6 @@ test "serialize instructions" {
 
     for (testcases) |case| {
         const actual = case.inst.toU32();
-        testing.expectEqual(case.expected, actual);
+        try testing.expectEqual(case.expected, actual);
     }
 }

src/codegen/wasm.zig

@@ -463,11 +463,11 @@ test "Wasm - buildOpcode" {
     const i64_extend32_s = buildOpcode(.{ .op = .extend, .valtype1 = .i64, .width = 32, .signedness = .signed });
     const f64_reinterpret_i64 = buildOpcode(.{ .op = .reinterpret, .valtype1 = .f64, .valtype2 = .i64 });
 
-    testing.expectEqual(@as(wasm.Opcode, .i32_const), i32_const);
-    testing.expectEqual(@as(wasm.Opcode, .end), end);
-    testing.expectEqual(@as(wasm.Opcode, .local_get), local_get);
-    testing.expectEqual(@as(wasm.Opcode, .i64_extend32_s), i64_extend32_s);
-    testing.expectEqual(@as(wasm.Opcode, .f64_reinterpret_i64), f64_reinterpret_i64);
+    try testing.expectEqual(@as(wasm.Opcode, .i32_const), i32_const);
+    try testing.expectEqual(@as(wasm.Opcode, .end), end);
+    try testing.expectEqual(@as(wasm.Opcode, .local_get), local_get);
+    try testing.expectEqual(@as(wasm.Opcode, .i64_extend32_s), i64_extend32_s);
+    try testing.expectEqual(@as(wasm.Opcode, .f64_reinterpret_i64), f64_reinterpret_i64);
 }
 
 pub const Result = union(enum) {

src/link/MachO/CodeSignature.zig

@@ -182,7 +182,7 @@ test "CodeSignature header" {
     try code_sig.writeHeader(stream.writer());
 
     const expected = &[_]u8{ 0xfa, 0xde, 0x0c, 0xc0, 0x0, 0x0, 0x0, 0xc, 0x0, 0x0, 0x0, 0x0 };
-    testing.expect(mem.eql(u8, expected, &buffer));
+    try testing.expect(mem.eql(u8, expected, &buffer));
 }
 
 pub fn calcCodeSignaturePaddingSize(id: []const u8, file_size: u64, page_size: u16) u32 {