3 files changed, 22 insertions, 14 deletions

diff --git a/clap.zig b/clap.zig
index 49d0670..8d721fa 100644
--- a/clap.zig
+++ b/clap.zig
@@ -219,10 +219,10 @@ pub const Diagnostic = struct {
             Arg{ .prefix = "", .name = diag.arg };
 
         switch (err) {
-            error.DoesntTakeValue => try stream.print("The argument '{}{}' does not take a value\n", .{ a.prefix, a.name }),
-            error.MissingValue => try stream.print("The argument '{}{}' requires a value but none was supplied\n", .{ a.prefix, a.name }),
-            error.InvalidArgument => try stream.print("Invalid argument '{}{}'\n", .{ a.prefix, a.name }),
-            else => try stream.print("Error while parsing arguments: {}\n", .{@errorName(err)}),
+            error.DoesntTakeValue => try stream.print("The argument '{s}{s}' does not take a value\n", .{ a.prefix, a.name }),
+            error.MissingValue => try stream.print("The argument '{s}{s}' requires a value but none was supplied\n", .{ a.prefix, a.name }),
+            error.InvalidArgument => try stream.print("Invalid argument '{s}{s}'\n", .{ a.prefix, a.name }),
+            else => try stream.print("Error while parsing arguments: {s}\n", .{@errorName(err)}),
         }
     }
 };
@@ -338,7 +338,7 @@ pub fn helpFull(
     const max_spacing = blk: {
         var res: usize = 0;
         for (params) |param| {
-            var cs = io.countingOutStream(io.null_out_stream);
+            var cs = io.countingOutStream(io.null_writer);
             try printParam(cs.writer(), Id, param, Error, context, valueText);
             if (res < cs.bytes_written)
                 res = @intCast(usize, cs.bytes_written);
@@ -351,7 +351,7 @@ pub fn helpFull(
         if (param.names.short == null and param.names.long == null)
             continue;
 
-        var cs = io.countingOutStream(stream);
+        var cs = io.countingWriter(stream);
         try stream.print("\t", .{});
         try printParam(cs.writer(), Id, param, Error, context, valueText);
         try stream.writeByteNTimes(' ', max_spacing - @intCast(usize, cs.bytes_written));
@@ -379,13 +379,13 @@ fn printParam(
             try stream.print("  ", .{});
         }
 
-        try stream.print("--{}", .{l});
+        try stream.print("--{s}", .{l});
     }
 
     switch (param.takes_value) {
         .none => {},
-        .one => try stream.print(" <{}>", .{valueText(context, param)}),
-        .many => try stream.print(" <{}>...", .{valueText(context, param)}),
+        .one => try stream.print(" <{s}>", .{valueText(context, param)}),
+        .many => try stream.print(" <{s}>...", .{valueText(context, param)}),
     }
 }
 
@@ -487,7 +487,7 @@ pub fn usageFull(
     context: anytype,
     valueText: fn (@TypeOf(context), Param(Id)) Error![]const u8,
 ) !void {
-    var cos = io.countingOutStream(stream);
+    var cos = io.countingWriter(stream);
     const cs = cos.writer();
     for (params) |param| {
         const name = param.names.short orelse continue;
@@ -517,11 +517,11 @@ pub fn usageFull(
         if (cos.bytes_written != 0)
             try cs.writeByte(' ');
 
-        try cs.print("[{}{}", .{ prefix, name });
+        try cs.print("[{s}{s}", .{ prefix, name });
         switch (param.takes_value) {
             .none => {},
-            .one => try cs.print(" <{}>", .{try valueText(context, param)}),
-            .many => try cs.print(" <{}>...", .{try valueText(context, param)}),
+            .one => try cs.print(" <{s}>", .{try valueText(context, param)}),
+            .many => try cs.print(" <{s}>...", .{try valueText(context, param)}),
         }
 
         try cs.writeByte(']');
@@ -530,7 +530,7 @@ pub fn usageFull(
     if (positional) |p| {
         if (cos.bytes_written != 0)
             try cs.writeByte(' ');
-        try cs.print("<{}>", .{try valueText(context, p)});
+        try cs.print("<{s}>", .{try valueText(context, p)});
     }
 }
 
diff --git a/example/simple-ex.zig b/example/simple-ex.zig
index f08751b..88598aa 100644
--- a/example/simple-ex.zig
+++ b/example/simple-ex.zig
@@ -30,7 +30,11 @@ pub fn main() !void {
         .diagnostic = &diag,
     }) catch |err| {
         // Report useful error and exit
+<<<<<<< HEAD
+        diag.report(std.io.getStdErr().writer(), err) catch {};
+=======
         diag.report(io.getStdErr().writer(), err) catch {};
+>>>>>>> master
         return err;
     };
     defer args.deinit();
diff --git a/example/streaming-clap.zig b/example/streaming-clap.zig
index 41efd1f..32d44c4 100644
--- a/example/streaming-clap.zig
+++ b/example/streaming-clap.zig
@@ -39,7 +39,11 @@ pub fn main() !void {
     // Because we use a streaming parser, we have to consume each argument parsed individually.
     while (parser.next() catch |err| {
         // Report useful error and exit
+<<<<<<< HEAD
+        diag.report(std.io.getStdErr().writer(), err) catch {};
+=======
         diag.report(io.getStdErr().writer(), err) catch {};
+>>>>>>> master
         return err;
     }) |arg| {
         // arg.param will point to the parameter which matched the argument.