5 files changed, 18 insertions, 18 deletions

diff --git a/build.zig b/build.zig
index 466f5d0..9baf1d4 100644
--- a/build.zig
+++ b/build.zig
@@ -62,7 +62,7 @@ pub fn build(b: *Builder) void {
 
 fn readMeStep(b: *Builder) *std.build.Step {
     const s = b.allocator.create(std.build.Step) catch unreachable;
-    s.* = std.build.Step.init("ReadMeStep", b.allocator, struct {
+    s.* = std.build.Step.init(.Custom, "ReadMeStep", b.allocator, struct {
         fn make(step: *std.build.Step) anyerror!void {
             @setEvalBranchQuota(10000);
             const file = try std.fs.cwd().createFile("README.md", .{});
diff --git a/clap.zig b/clap.zig
index 8846d3b..8624c88 100644
--- a/clap.zig
+++ b/clap.zig
@@ -259,7 +259,7 @@ pub const Diagnostic = struct {
 
     /// Default diagnostics reporter when all you want is English with no colors.
     /// Use this as a reference for implementing your own if needed.
-    pub fn report(diag: Diagnostic, stream: var, err: anyerror) !void {
+    pub fn report(diag: Diagnostic, stream: anytype, err: anyerror) !void {
         const Arg = struct {
             prefix: []const u8,
             name: []const u8,
@@ -354,11 +354,11 @@ pub fn parse(
 ///         --long             helpText
 ///         --long <valueText> helpText
 pub fn helpFull(
-    stream: var,
+    stream: anytype,
     comptime Id: type,
     params: []const Param(Id),
     comptime Error: type,
-    context: var,
+    context: anytype,
     helpText: fn (@TypeOf(context), Param(Id)) Error![]const u8,
     valueText: fn (@TypeOf(context), Param(Id)) Error![]const u8,
 ) !void {
@@ -387,11 +387,11 @@ pub fn helpFull(
 }
 
 fn printParam(
-    stream: var,
+    stream: anytype,
     comptime Id: type,
     param: Param(Id),
     comptime Error: type,
-    context: var,
+    context: anytype,
     valueText: fn (@TypeOf(context), Param(Id)) Error![]const u8,
 ) !void {
     if (param.names.short) |s| {
@@ -419,7 +419,7 @@ fn printParam(
 /// A wrapper around helpFull for simple helpText and valueText functions that
 /// cant return an error or take a context.
 pub fn helpEx(
-    stream: var,
+    stream: anytype,
     comptime Id: type,
     params: []const Param(Id),
     helpText: fn (Param(Id)) []const u8,
@@ -458,7 +458,7 @@ pub const Help = struct {
 };
 
 /// A wrapper around helpEx that takes a Param(Help).
-pub fn help(stream: var, params: []const Param(Help)) !void {
+pub fn help(stream: anytype, params: []const Param(Help)) !void {
     try helpEx(stream, Help, params, getHelpSimple, getValueSimple);
 }
 
@@ -512,11 +512,11 @@ test "clap.help" {
 /// First all none value taking parameters, which have a short name are
 /// printed, then non positional parameters and finally the positinal.
 pub fn usageFull(
-    stream: var,
+    stream: anytype,
     comptime Id: type,
     params: []const Param(Id),
     comptime Error: type,
-    context: var,
+    context: anytype,
     valueText: fn (@TypeOf(context), Param(Id)) Error![]const u8,
 ) !void {
     var cos = io.countingOutStream(stream);
@@ -569,7 +569,7 @@ pub fn usageFull(
 /// A wrapper around usageFull for a simple valueText functions that
 /// cant return an error or take a context.
 pub fn usageEx(
-    stream: var,
+    stream: anytype,
     comptime Id: type,
     params: []const Param(Id),
     valueText: fn (Param(Id)) []const u8,
@@ -593,7 +593,7 @@ pub fn usageEx(
 }
 
 /// A wrapper around usageEx that takes a Param(Help).
-pub fn usage(stream: var, params: []const Param(Help)) !void {
+pub fn usage(stream: anytype, params: []const Param(Help)) !void {
     try usageEx(stream, Help, params, getValueSimple);
 }
 
diff --git a/clap/args.zig b/clap/args.zig
index 0105769..52626fc 100644
--- a/clap/args.zig
+++ b/clap/args.zig
@@ -53,7 +53,7 @@ pub const OsIterator = struct {
     /// The executable path (this is the first argument passed to the program)
     /// TODO: Is it the right choice for this to be null? Maybe `init` should
     ///       return an error when we have no exe.
-    exe_arg: ?[]const u8,
+    exe_arg: ?[:0]const u8,
 
     pub fn init(allocator: *mem.Allocator) Error!OsIterator {
         var res = OsIterator{
@@ -69,7 +69,7 @@ pub const OsIterator = struct {
         iter.arena.deinit();
     }
 
-    pub fn next(iter: *OsIterator) Error!?[]const u8 {
+    pub fn next(iter: *OsIterator) Error!?[:0]const u8 {
         if (builtin.os.tag == .windows) {
             return try iter.args.next(&iter.arena.allocator) orelse return null;
         } else {
diff --git a/clap/comptime.zig b/clap/comptime.zig
index 9ead41a..80eb428 100644
--- a/clap/comptime.zig
+++ b/clap/comptime.zig
@@ -169,10 +169,10 @@ test "" {
     testing.expect(args.flag("--aa"));
     testing.expect(!args.flag("-b"));
     testing.expect(!args.flag("--bb"));
-    testing.expectEqualSlices(u8, "0", args.option("-c").?);
-    testing.expectEqualSlices(u8, "0", args.option("--cc").?);
+    testing.expectEqualStrings("0", args.option("-c").?);
+    testing.expectEqualStrings("0", args.option("--cc").?);
     testing.expectEqual(@as(usize, 1), args.positionals().len);
-    testing.expectEqualSlices(u8, "something", args.positionals()[0]);
+    testing.expectEqualStrings("something", args.positionals()[0]);
     testing.expectEqualSlices([]const u8, &[_][]const u8{ "a", "b" }, args.options("-d"));
     testing.expectEqualSlices([]const u8, &[_][]const u8{ "a", "b" }, args.options("--dd"));
 }
diff --git a/clap/streaming.zig b/clap/streaming.zig
index e0b808e..844cbf7 100644
--- a/clap/streaming.zig
+++ b/clap/streaming.zig
@@ -167,7 +167,7 @@ pub fn StreamingClap(comptime Id: type, comptime ArgIterator: type) type {
             return err(diag, arg, .{ .short = arg[index] }, error.InvalidArgument);
         }
 
-        fn err(diag: ?*clap.Diagnostic, arg: []const u8, names: clap.Names, _err: var) @TypeOf(_err) {
+        fn err(diag: ?*clap.Diagnostic, arg: []const u8, names: clap.Names, _err: anytype) @TypeOf(_err) {
             if (diag) |d|
                 d.* = .{ .arg = arg, .name = names };
             return _err;