From 2174a4a2e617e51fea42e114803538b9bedb9d35 Mon Sep 17 00:00:00 2001
From: dbandstra
Date: Sun, 1 Dec 2019 23:10:25 -0800
Subject: update for latest zig

---
 clap/args.zig      |  2 +-
 clap/comptime.zig  |  8 ++++----
 clap/streaming.zig | 26 +++++++++++++-------------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'clap')

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 <V>") 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 = &params[2];
 
     testNoErr(
-        params,
-        [_][]const u8{
+        &params,
+        &[_][]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 = &params[2];
 
     testNoErr(
-        params,
-        [_][]const u8{
+        &params,
+        &[_][]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){
+        &params,
+        &[_][]const u8{ "aa", "bb" },
+        &[_]Arg(u8){
             Arg(u8){ .param = &params[0], .value = "aa" },
             Arg(u8){ .param = &params[0], .value = "bb" },
         },
@@ -315,15 +315,15 @@ test "clap.streaming.StreamingClap: all params" {
     const positional = &params[3];
 
     testNoErr(
-        params,
-        [_][]const u8{
+        &params,
+        &[_][]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 },
-- 
cgit v1.2.3