From c5f6c0861d5a9d69783ec8838b97eedc38932b34 Mon Sep 17 00:00:00 2001
From: dbandstra
Date: Mon, 9 Dec 2019 20:03:39 -0800
Subject: update for latest zig (varargs is no more)

---
 README.md                  | 18 +++++++++---------
 build.zig                  |  5 ++---
 clap.zig                   | 32 ++++++++++++++++----------------
 example/comptime-clap.zig  |  6 +++---
 example/simple.zig         |  6 +++---
 example/streaming-clap.zig |  6 +++---
 6 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index bc308d5..e5ec35c 100644
--- a/README.md
+++ b/README.md
@@ -40,11 +40,11 @@ pub fn main() !void {
     defer args.deinit();
 
     if (args.flag("--help"))
-        debug.warn("--help\n");
+        debug.warn("--help\n", .{});
     if (args.option("--number")) |n|
-        debug.warn("--number = {}\n", n);
+        debug.warn("--number = {}\n", .{ n });
     for (args.positionals()) |pos|
-        debug.warn("{}\n", pos);
+        debug.warn("{}\n", .{ pos });
 }
 
 ```
@@ -119,11 +119,11 @@ pub fn main() !void {
     defer args.deinit();
 
     if (args.flag("--help"))
-        debug.warn("--help\n");
+        debug.warn("--help\n", .{});
     if (args.option("--number")) |n|
-        debug.warn("--number = {}\n", n);
+        debug.warn("--number = {}\n", .{ n });
     for (args.positionals()) |pos|
-        debug.warn("{}\n", pos);
+        debug.warn("{}\n", .{ pos });
 }
 
 ```
@@ -174,13 +174,13 @@ pub fn main() !void {
     while (try parser.next()) |arg| {
         // arg.param will point to the parameter which matched the argument.
         switch (arg.param.id) {
-            'h' => debug.warn("Help!\n"),
-            'n' => debug.warn("--number = {}\n", arg.value.?),
+            'h' => debug.warn("Help!\n", .{}),
+            'n' => debug.warn("--number = {}\n", .{ arg.value.? }),
 
             // arg.value == null, if arg.param.takes_value == false.
             // Otherwise, arg.value is the value passed with the argument, such as "-a=10"
             // or "-a 10".
-            'f' => debug.warn("{}\n", arg.value.?),
+            'f' => debug.warn("{}\n", .{ arg.value.? }),
             else => unreachable,
         }
     }
diff --git a/build.zig b/build.zig
index d6e034b..87cb366 100644
--- a/build.zig
+++ b/build.zig
@@ -60,14 +60,13 @@ fn readMeStep(b: *Builder) *std.build.Step {
             @setEvalBranchQuota(10000);
             const file = try std.fs.File.openWrite("README.md");
             const stream = &file.outStream().stream;
-            try stream.print(
-                @embedFile("example/README.md.template"),
+            try stream.print(@embedFile("example/README.md.template"), .{
                 @embedFile("example/simple.zig"),
                 @embedFile("example/simple-error.zig"),
                 @embedFile("example/comptime-clap.zig"),
                 @embedFile("example/streaming-clap.zig"),
                 @embedFile("example/help.zig"),
-            );
+            });
         }
     }.make);
     return s;
diff --git a/clap.zig b/clap.zig
index 2026d95..a300266 100644
--- a/clap.zig
+++ b/clap.zig
@@ -296,10 +296,10 @@ pub fn helpFull(
             continue;
 
         var counting_stream = io.CountingOutStream(@typeOf(stream.*).Error).init(stream);
-        try stream.print("\t");
+        try stream.print("\t", .{});
         try printParam(&counting_stream.stream, Id, param, Error, context, value_text);
         try stream.writeByteNTimes(' ', max_spacing - counting_stream.bytes_written);
-        try stream.print("\t{}\n", try help_text(context, param));
+        try stream.print("\t{}\n", .{ try help_text(context, param) });
     }
 }
 
@@ -312,21 +312,21 @@ fn printParam(
     value_text: fn (@typeOf(context), Param(Id)) Error![]const u8,
 ) @typeOf(stream.*).Error!void {
     if (param.names.short) |s| {
-        try stream.print("-{c}", s);
+        try stream.print("-{c}", .{ s });
     } else {
-        try stream.print("  ");
+        try stream.print("  ", .{});
     }
     if (param.names.long) |l| {
         if (param.names.short) |_| {
-            try stream.print(", ");
+            try stream.print(", ", .{});
         } else {
-            try stream.print("  ");
+            try stream.print("  ", .{});
         }
 
-        try stream.print("--{}", l);
+        try stream.print("--{}", .{ l });
     }
     if (param.takes_value)
-        try stream.print(" <{}>", value_text(context, param));
+        try stream.print(" <{}>", .{ value_text(context, param) });
 }
 
 /// A wrapper around helpFull for simple help_text and value_text functions that
@@ -414,18 +414,18 @@ test "clap.help" {
 
     const actual = slice_stream.getWritten();
     if (!mem.eql(u8, actual, expected)) {
-        debug.warn("\n============ Expected ============\n");
-        debug.warn("{}", expected);
-        debug.warn("============= Actual =============\n");
-        debug.warn("{}", actual);
+        debug.warn("\n============ Expected ============\n", .{});
+        debug.warn("{}", .{ expected });
+        debug.warn("============= Actual =============\n", .{});
+        debug.warn("{}", .{ actual });
 
         var buffer: [1024 * 2]u8 = undefined;
         var fba = std.heap.FixedBufferAllocator.init(&buffer);
 
-        debug.warn("============ Expected (escaped) ============\n");
-        debug.warn("{x}\n", expected);
-        debug.warn("============ Actual (escaped) ============\n");
-        debug.warn("{x}\n", actual);
+        debug.warn("============ Expected (escaped) ============\n", .{});
+        debug.warn("{x}\n", .{ expected });
+        debug.warn("============ Actual (escaped) ============\n", .{});
+        debug.warn("{x}\n", .{ actual });
         testing.expect(false);
     }
 }
diff --git a/example/comptime-clap.zig b/example/comptime-clap.zig
index fde0648..a030368 100644
--- a/example/comptime-clap.zig
+++ b/example/comptime-clap.zig
@@ -26,9 +26,9 @@ pub fn main() !void {
     defer args.deinit();
 
     if (args.flag("--help"))
-        debug.warn("--help\n");
+        debug.warn("--help\n", .{});
     if (args.option("--number")) |n|
-        debug.warn("--number = {}\n", n);
+        debug.warn("--number = {}\n", .{ n });
     for (args.positionals()) |pos|
-        debug.warn("{}\n", pos);
+        debug.warn("{}\n", .{ pos });
 }
diff --git a/example/simple.zig b/example/simple.zig
index a3f27ea..5ac204d 100644
--- a/example/simple.zig
+++ b/example/simple.zig
@@ -18,9 +18,9 @@ pub fn main() !void {
     defer args.deinit();
 
     if (args.flag("--help"))
-        debug.warn("--help\n");
+        debug.warn("--help\n", .{});
     if (args.option("--number")) |n|
-        debug.warn("--number = {}\n", n);
+        debug.warn("--number = {}\n", .{ n });
     for (args.positionals()) |pos|
-        debug.warn("{}\n", pos);
+        debug.warn("{}\n", .{ pos });
 }
diff --git a/example/streaming-clap.zig b/example/streaming-clap.zig
index c9f20e2..b277266 100644
--- a/example/streaming-clap.zig
+++ b/example/streaming-clap.zig
@@ -38,13 +38,13 @@ pub fn main() !void {
     while (try parser.next()) |arg| {
         // arg.param will point to the parameter which matched the argument.
         switch (arg.param.id) {
-            'h' => debug.warn("Help!\n"),
-            'n' => debug.warn("--number = {}\n", arg.value.?),
+            'h' => debug.warn("Help!\n", .{}),
+            'n' => debug.warn("--number = {}\n", .{ arg.value.? }),
 
             // arg.value == null, if arg.param.takes_value == false.
             // Otherwise, arg.value is the value passed with the argument, such as "-a=10"
             // or "-a 10".
-            'f' => debug.warn("{}\n", arg.value.?),
+            'f' => debug.warn("{}\n", .{ arg.value.? }),
             else => unreachable,
         }
     }
-- 
cgit v1.2.3