diff --git a/README.md b/README.md index 0555a0f..bc308d5 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ pub fn main() !void { }, }; - var args = try clap.parse(clap.Help, params, std.heap.direct_allocator); + var args = try clap.parse(clap.Help, ¶ms, std.heap.direct_allocator); defer args.deinit(); if (args.flag("--help")) @@ -63,7 +63,7 @@ pub fn main() !void { clap.parseParam("-h, --help Display this help and exit.") catch unreachable, }; - var args = try clap.parse(clap.Help, params, std.heap.direct_allocator); + var args = try clap.parse(clap.Help, ¶ms, std.heap.direct_allocator); defer args.deinit(); _ = args.flag("--helps"); @@ -115,7 +115,7 @@ pub fn main() !void { defer iter.deinit(); // Parse the arguments - var args = try clap.ComptimeClap(clap.Help, params).parse(allocator, clap.args.OsIterator, &iter); + var args = try clap.ComptimeClap(clap.Help, ¶ms).parse(allocator, clap.args.OsIterator, &iter); defer args.deinit(); if (args.flag("--help")) @@ -166,7 +166,7 @@ pub fn main() !void { // Initialize our streaming parser. var parser = clap.StreamingClap(u8, clap.args.OsIterator){ - .params = params, + .params = ¶ms, .iter = &iter, }; @@ -201,7 +201,7 @@ const std = @import("std"); const clap = @import("clap"); pub fn main() !void { - const stderr_file = try std.io.getStdErr(); + const stderr_file = std.io.getStdErr(); var stderr_out_stream = stderr_file.outStream(); const stderr = &stderr_out_stream.stream; @@ -210,7 +210,7 @@ pub fn main() !void { // help message for any Param, but it is more verbose to call. try clap.help( stderr, - comptime [_]clap.Param(clap.Help){ + comptime &[_]clap.Param(clap.Help){ clap.parseParam("-h, --help Display this help and exit. ") catch unreachable, clap.parseParam("-v, --version Output version information and exit.") catch unreachable, }, diff --git a/build.zig b/build.zig index 1a6fe09..d6e034b 100644 --- a/build.zig +++ b/build.zig @@ -7,7 +7,7 @@ const Builder = std.build.Builder; pub fn build(b: *Builder) void { const mode = b.standardReleaseOptions(); - const fmt_step = b.addFmt([_][]const u8{ + const fmt_step = b.addFmt(&[_][]const u8{ "build.zig", "clap", }); diff --git a/clap.zig b/clap.zig index e0d20e3..2026d95 100644 --- a/clap.zig +++ b/clap.zig @@ -388,7 +388,7 @@ test "clap.help" { var slice_stream = io.SliceOutStream.init(buf[0..]); try help( &slice_stream.stream, - comptime [_]Param(Help){ + comptime &[_]Param(Help){ parseParam("-a Short flag. ") catch unreachable, parseParam("-b Short option.") catch unreachable, parseParam("--aa Long flag. ") catch unreachable, diff --git a/clap/args.zig b/clap/args.zig index b699438..071f756 100644 --- a/clap/args.zig +++ b/clap/args.zig @@ -33,7 +33,7 @@ pub const SliceIterator = struct { }; test "clap.args.SliceIterator" { - const args = [_][]const u8{ "A", "BB", "CCC" }; + const args = &[_][]const u8{ "A", "BB", "CCC" }; var iter = SliceIterator{ .args = args }; for (args) |a| { diff --git a/clap/comptime.zig b/clap/comptime.zig index f5c2762..c25659b 100644 --- a/clap/comptime.zig +++ b/clap/comptime.zig @@ -9,7 +9,7 @@ const debug = std.debug; pub fn ComptimeClap(comptime Id: type, comptime params: []const clap.Param(Id)) type { var flags: usize = 0; var options: usize = 0; - var converted_params: []const clap.Param(usize) = [_]clap.Param(usize){}; + var converted_params: []const clap.Param(usize) = &[_]clap.Param(usize){}; for (params) |param| { var index: usize = 0; if (param.names.long != null or param.names.short != null) { @@ -113,7 +113,7 @@ pub fn ComptimeClap(comptime Id: type, comptime params: []const clap.Param(Id)) } test "clap.comptime.ComptimeClap" { - const Clap = ComptimeClap(clap.Help, comptime [_]clap.Param(clap.Help){ + const Clap = ComptimeClap(clap.Help, comptime &[_]clap.Param(clap.Help){ clap.parseParam("-a, --aa ") catch unreachable, clap.parseParam("-b, --bb ") catch unreachable, clap.parseParam("-c, --cc ") catch unreachable, @@ -125,7 +125,7 @@ test "clap.comptime.ComptimeClap" { var buf: [1024]u8 = undefined; var fb_allocator = heap.FixedBufferAllocator.init(buf[0..]); var iter = clap.args.SliceIterator{ - .args = [_][]const u8{ + .args = &[_][]const u8{ "-a", "-c", "0", "something", }, }; @@ -138,6 +138,6 @@ test "clap.comptime.ComptimeClap" { testing.expect(!args.flag("--bb")); testing.expectEqualSlices(u8, "0", args.option("-c").?); testing.expectEqualSlices(u8, "0", args.option("--cc").?); - testing.expectEqual(usize(1), args.positionals().len); + testing.expectEqual(@as(usize, 1), args.positionals().len); testing.expectEqualSlices(u8, "something", args.positionals()[0]); } diff --git a/clap/streaming.zig b/clap/streaming.zig index fa7ce80..3678917 100644 --- a/clap/streaming.zig +++ b/clap/streaming.zig @@ -170,7 +170,7 @@ fn testNoErr(params: []const clap.Param(u8), args_strings: []const []const u8, r const arg = (c.next() catch unreachable) orelse unreachable; testing.expectEqual(res.param, arg.param); const expected_value = res.value orelse { - testing.expectEqual(@typeOf(arg.value)(null), arg.value); + testing.expectEqual(@as(@typeOf(arg.value), null), arg.value); continue; }; const actual_value = arg.value orelse unreachable; @@ -203,13 +203,13 @@ test "clap.streaming.StreamingClap: short params" { const c = ¶ms[2]; testNoErr( - params, - [_][]const u8{ + ¶ms, + &[_][]const u8{ "-a", "-b", "-ab", "-ba", "-c", "0", "-c=0", "-ac", "0", "-ac=0", }, - [_]Arg(u8){ + &[_]Arg(u8){ Arg(u8){ .param = a }, Arg(u8){ .param = b }, Arg(u8){ .param = a }, @@ -248,13 +248,13 @@ test "clap.streaming.StreamingClap: long params" { const cc = ¶ms[2]; testNoErr( - params, - [_][]const u8{ + ¶ms, + &[_][]const u8{ "--aa", "--bb", "--cc", "0", "--cc=0", }, - [_]Arg(u8){ + &[_]Arg(u8){ Arg(u8){ .param = aa }, Arg(u8){ .param = bb }, Arg(u8){ .param = cc, .value = "0" }, @@ -270,9 +270,9 @@ test "clap.streaming.StreamingClap: positional params" { }}; testNoErr( - params, - [_][]const u8{ "aa", "bb" }, - [_]Arg(u8){ + ¶ms, + &[_][]const u8{ "aa", "bb" }, + &[_]Arg(u8){ Arg(u8){ .param = ¶ms[0], .value = "aa" }, Arg(u8){ .param = ¶ms[0], .value = "bb" }, }, @@ -315,15 +315,15 @@ test "clap.streaming.StreamingClap: all params" { const positional = ¶ms[3]; testNoErr( - params, - [_][]const u8{ + ¶ms, + &[_][]const u8{ "-a", "-b", "-ab", "-ba", "-c", "0", "-c=0", "-ac", "0", "-ac=0", "--aa", "--bb", "--cc", "0", "--cc=0", "something", "--", "-", }, - [_]Arg(u8){ + &[_]Arg(u8){ Arg(u8){ .param = aa }, Arg(u8){ .param = bb }, Arg(u8){ .param = aa }, diff --git a/example/comptime-clap.zig b/example/comptime-clap.zig index 4d0ace3..fde0648 100644 --- a/example/comptime-clap.zig +++ b/example/comptime-clap.zig @@ -22,7 +22,7 @@ pub fn main() !void { defer iter.deinit(); // Parse the arguments - var args = try clap.ComptimeClap(clap.Help, params).parse(allocator, clap.args.OsIterator, &iter); + var args = try clap.ComptimeClap(clap.Help, ¶ms).parse(allocator, clap.args.OsIterator, &iter); defer args.deinit(); if (args.flag("--help")) diff --git a/example/help.zig b/example/help.zig index de8a55a..1191482 100644 --- a/example/help.zig +++ b/example/help.zig @@ -2,7 +2,7 @@ const std = @import("std"); const clap = @import("clap"); pub fn main() !void { - const stderr_file = try std.io.getStdErr(); + const stderr_file = std.io.getStdErr(); var stderr_out_stream = stderr_file.outStream(); const stderr = &stderr_out_stream.stream; @@ -11,7 +11,7 @@ pub fn main() !void { // help message for any Param, but it is more verbose to call. try clap.help( stderr, - comptime [_]clap.Param(clap.Help){ + comptime &[_]clap.Param(clap.Help){ clap.parseParam("-h, --help Display this help and exit. ") catch unreachable, clap.parseParam("-v, --version Output version information and exit.") catch unreachable, }, diff --git a/example/simple-error.zig b/example/simple-error.zig index fc72a03..2c403fc 100644 --- a/example/simple-error.zig +++ b/example/simple-error.zig @@ -8,7 +8,7 @@ pub fn main() !void { clap.parseParam("-h, --help Display this help and exit.") catch unreachable, }; - var args = try clap.parse(clap.Help, params, std.heap.direct_allocator); + var args = try clap.parse(clap.Help, ¶ms, std.heap.direct_allocator); defer args.deinit(); _ = args.flag("--helps"); diff --git a/example/simple.zig b/example/simple.zig index f791447..a3f27ea 100644 --- a/example/simple.zig +++ b/example/simple.zig @@ -14,7 +14,7 @@ pub fn main() !void { }, }; - var args = try clap.parse(clap.Help, params, std.heap.direct_allocator); + var args = try clap.parse(clap.Help, ¶ms, std.heap.direct_allocator); defer args.deinit(); if (args.flag("--help")) diff --git a/example/streaming-clap.zig b/example/streaming-clap.zig index 0361d46..c9f20e2 100644 --- a/example/streaming-clap.zig +++ b/example/streaming-clap.zig @@ -30,7 +30,7 @@ pub fn main() !void { // Initialize our streaming parser. var parser = clap.StreamingClap(u8, clap.args.OsIterator){ - .params = params, + .params = ¶ms, .iter = &iter, };