7 files changed, 24 insertions, 23 deletions

diff --git a/example/README.md.template b/example/README.md.template
index 5e75d5d..2afbe86 100644
--- a/example/README.md.template
+++ b/example/README.md.template
@@ -2,6 +2,10 @@
 
 A simple and easy to use command line argument parser library for Zig.
 
+Looking for a version that works with `zig master`? The `zig-master` branch has
+you covered. It is maintained by people who live at head (not me) and is merged
+into master on every `zig` release.
+
 ## Features
 
 * Short arguments `-a`
diff --git a/example/comptime-clap.zig b/example/comptime-clap.zig
index 4d0ace3..f5c0221 100644
--- a/example/comptime-clap.zig
+++ b/example/comptime-clap.zig
@@ -4,7 +4,7 @@ const clap = @import("clap");
 const debug = std.debug;
 
 pub fn main() !void {
-    const allocator = std.heap.direct_allocator;
+    const allocator = std.heap.page_allocator;
 
     // First we specify what parameters our program can take.
     // We can use `parseParam` to parse a string to a `Param(Help)`
@@ -22,13 +22,13 @@ 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, &params).parse(allocator, clap.args.OsIterator, &iter);
     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/help.zig b/example/help.zig
index de8a55a..2775177 100644
--- a/example/help.zig
+++ b/example/help.zig
@@ -2,16 +2,15 @@ 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;
 
     // clap.help is a function that can print a simple help message, given a
     // slice of Param(Help). There is also a helpEx, which can print a
     // help message for any Param, but it is more verbose to call.
     try clap.help(
-        stderr,
-        comptime [_]clap.Param(clap.Help){
+        stderr_out_stream,
+        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, &params, std.heap.direct_allocator);
     defer args.deinit();
 
     _ = args.flag("--helps");
diff --git a/example/simple.zig b/example/simple.zig
index f791447..d546223 100644
--- a/example/simple.zig
+++ b/example/simple.zig
@@ -14,13 +14,13 @@ pub fn main() !void {
         },
     };
 
-    var args = try clap.parse(clap.Help, params, std.heap.direct_allocator);
+    var args = try clap.parse(clap.Help, &params, std.heap.page_allocator);
     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 0361d46..4cc43d1 100644
--- a/example/streaming-clap.zig
+++ b/example/streaming-clap.zig
@@ -4,7 +4,7 @@ const clap = @import("clap");
 const debug = std.debug;
 
 pub fn main() !void {
-    const allocator = std.heap.direct_allocator;
+    const allocator = std.heap.page_allocator;
 
     // First we specify what parameters our program can take.
     const params = [_]clap.Param(u8){
@@ -30,7 +30,7 @@ pub fn main() !void {
 
     // Initialize our streaming parser.
     var parser = clap.StreamingClap(u8, clap.args.OsIterator){
-        .params = params,
+        .params = &params,
         .iter = &iter,
     };
 
@@ -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,
         }
     }
diff --git a/example/usage.zig b/example/usage.zig
index 734d741..25e1a34 100644
--- a/example/usage.zig
+++ b/example/usage.zig
@@ -2,16 +2,14 @@ const std = @import("std");
 const clap = @import("clap");
 
 pub fn main() !void {
-    const stderr_file = try std.io.getStdErr();
-    var stderr_out_stream = stderr_file.outStream();
-    const stderr = &stderr_out_stream.stream;
+    const stderr = std.io.getStdErr().outStream();
 
     // clap.usage is a function that can print a simple usage message, given a
     // slice of Param(Help). There is also a usageEx, which can print a
     // usage message for any Param, but it is more verbose to call.
     try clap.usage(
         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,
             clap.parseParam("    --value <N>  Output version information and exit.") catch unreachable,