1 files changed, 43 insertions, 43 deletions

diff --git a/clap/args.zig b/clap/args.zig
index f9ad218..555e8ab 100644
--- a/clap/args.zig
+++ b/clap/args.zig
@@ -34,8 +34,8 @@ pub const SliceIterator = struct {
 };
 
 test "SliceIterator" {
-    const args = &[_][]const u8{ "A", "BB", "CCC" };
-    var iter = SliceIterator{ .args = args };
+    const args = [_][]const u8{ "A", "BB", "CCC" };
+    var iter = SliceIterator{ .args = &args };
 
     for (args) |a| {
         const b = try iter.next();
@@ -266,76 +266,76 @@ pub const ShellIterator = struct {
     }
 };
 
-fn testShellIteratorOk(str: []const u8, allocations: usize, expect: []const []const u8) void {
+fn testShellIteratorOk(str: []const u8, allocations: usize, expect: []const []const u8) !void {
     var allocator = testing.FailingAllocator.init(testing.allocator, allocations);
     var it = ShellIterator.init(&allocator.allocator, str);
     defer it.deinit();
 
     for (expect) |e| {
         if (it.next()) |actual| {
-            testing.expect(actual != null);
-            testing.expectEqualStrings(e, actual.?);
-        } else |err| testing.expectEqual(@as(anyerror![]const u8, e), err);
+            try testing.expect(actual != null);
+            try testing.expectEqualStrings(e, actual.?);
+        } else |err| try testing.expectEqual(@as(anyerror![]const u8, e), err);
     }
 
     if (it.next()) |actual| {
-        testing.expectEqual(@as(?[]const u8, null), actual);
-        testing.expectEqual(allocations, allocator.allocations);
-    } else |err| testing.expectEqual(@as(anyerror!void, {}), err);
+        try testing.expectEqual(@as(?[]const u8, null), actual);
+        try testing.expectEqual(allocations, allocator.allocations);
+    } else |err| try testing.expectEqual(@as(anyerror!void, {}), err);
 }
 
-fn testShellIteratorErr(str: []const u8, expect: anyerror) void {
+fn testShellIteratorErr(str: []const u8, expect: anyerror) !void {
     var it = ShellIterator.init(testing.allocator, str);
     defer it.deinit();
 
     while (it.next() catch |err| {
-        testing.expectError(expect, @as(anyerror!void, err));
+        try testing.expectError(expect, @as(anyerror!void, err));
         return;
     }) |_| {}
 
-    testing.expectError(expect, @as(anyerror!void, {}));
+    try testing.expectError(expect, @as(anyerror!void, {}));
 }
 
 test "ShellIterator" {
-    testShellIteratorOk("a", 0, &[_][]const u8{"a"});
-    testShellIteratorOk("'a'", 0, &[_][]const u8{"a"});
-    testShellIteratorOk("\"a\"", 0, &[_][]const u8{"a"});
-    testShellIteratorOk("a b", 0, &[_][]const u8{ "a", "b" });
-    testShellIteratorOk("'a' b", 0, &[_][]const u8{ "a", "b" });
-    testShellIteratorOk("\"a\" b", 0, &[_][]const u8{ "a", "b" });
-    testShellIteratorOk("a 'b'", 0, &[_][]const u8{ "a", "b" });
-    testShellIteratorOk("a \"b\"", 0, &[_][]const u8{ "a", "b" });
-    testShellIteratorOk("'a b'", 0, &[_][]const u8{"a b"});
-    testShellIteratorOk("\"a b\"", 0, &[_][]const u8{"a b"});
-    testShellIteratorOk("\"a\"\"b\"", 1, &[_][]const u8{"ab"});
-    testShellIteratorOk("'a''b'", 1, &[_][]const u8{"ab"});
-    testShellIteratorOk("'a'b", 1, &[_][]const u8{"ab"});
-    testShellIteratorOk("a'b'", 1, &[_][]const u8{"ab"});
-    testShellIteratorOk("a\\ b", 1, &[_][]const u8{"a b"});
-    testShellIteratorOk("\"a\\ b\"", 1, &[_][]const u8{"a b"});
-    testShellIteratorOk("'a\\ b'", 0, &[_][]const u8{"a\\ b"});
-    testShellIteratorOk("   a     b      ", 0, &[_][]const u8{ "a", "b" });
-    testShellIteratorOk("\\  \\ ", 0, &[_][]const u8{ " ", " " });
-
-    testShellIteratorOk(
+    try testShellIteratorOk("a", 0, &.{"a"});
+    try testShellIteratorOk("'a'", 0, &.{"a"});
+    try testShellIteratorOk("\"a\"", 0, &.{"a"});
+    try testShellIteratorOk("a b", 0, &.{ "a", "b" });
+    try testShellIteratorOk("'a' b", 0, &.{ "a", "b" });
+    try testShellIteratorOk("\"a\" b", 0, &.{ "a", "b" });
+    try testShellIteratorOk("a 'b'", 0, &.{ "a", "b" });
+    try testShellIteratorOk("a \"b\"", 0, &.{ "a", "b" });
+    try testShellIteratorOk("'a b'", 0, &.{"a b"});
+    try testShellIteratorOk("\"a b\"", 0, &.{"a b"});
+    try testShellIteratorOk("\"a\"\"b\"", 1, &.{"ab"});
+    try testShellIteratorOk("'a''b'", 1, &.{"ab"});
+    try testShellIteratorOk("'a'b", 1, &.{"ab"});
+    try testShellIteratorOk("a'b'", 1, &.{"ab"});
+    try testShellIteratorOk("a\\ b", 1, &.{"a b"});
+    try testShellIteratorOk("\"a\\ b\"", 1, &.{"a b"});
+    try testShellIteratorOk("'a\\ b'", 0, &.{"a\\ b"});
+    try testShellIteratorOk("   a     b      ", 0, &.{ "a", "b" });
+    try testShellIteratorOk("\\  \\ ", 0, &.{ " ", " " });
+
+    try testShellIteratorOk(
         \\printf 'run\nuninstall\n'
-    , 0, &[_][]const u8{ "printf", "run\\nuninstall\\n" });
-    testShellIteratorOk(
+    , 0, &.{ "printf", "run\\nuninstall\\n" });
+    try testShellIteratorOk(
         \\setsid -f steam "steam://$action/$id"
-    , 0, &[_][]const u8{ "setsid", "-f", "steam", "steam://$action/$id" });
-    testShellIteratorOk(
+    , 0, &.{ "setsid", "-f", "steam", "steam://$action/$id" });
+    try testShellIteratorOk(
         \\xargs -I% rg --no-heading --no-line-number --only-matching
         \\    --case-sensitive --multiline --text --byte-offset '(?-u)%' $@
         \\
-    , 0, &[_][]const u8{
+    , 0, &.{
         "xargs",            "-I%",             "rg",               "--no-heading",
         "--no-line-number", "--only-matching", "--case-sensitive", "--multiline",
         "--text",           "--byte-offset",   "(?-u)%",           "$@",
     });
 
-    testShellIteratorErr("'a", error.QuoteNotClosed);
-    testShellIteratorErr("'a\\", error.QuoteNotClosed);
-    testShellIteratorErr("\"a", error.QuoteNotClosed);
-    testShellIteratorErr("\"a\\", error.QuoteNotClosed);
-    testShellIteratorErr("a\\", error.DanglingEscape);
+    try testShellIteratorErr("'a", error.QuoteNotClosed);
+    try testShellIteratorErr("'a\\", error.QuoteNotClosed);
+    try testShellIteratorErr("\"a", error.QuoteNotClosed);
+    try testShellIteratorErr("\"a\\", error.QuoteNotClosed);
+    try testShellIteratorErr("a\\", error.DanglingEscape);
 }