Merge branch 'zig-master'

5 files changed, 16 insertions, 16 deletions

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f97e69a..08d791f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
           submodules: recursive
       - uses: goto-bus-stop/setup-zig@v1.3.0
         with:
-          version: 0.8.0
+          version: master
       - run: zig build
   lint:
     runs-on: ubuntu-latest
@@ -20,5 +20,5 @@ jobs:
       - uses: actions/checkout@v2.4.0
       - uses: goto-bus-stop/setup-zig@v1.3.0
         with:
-          version: 0.8.0
+          version: master
       - run: zig fmt --check .
diff --git a/build.zig b/build.zig
index d2e264a..9b1c0ce 100644
--- a/build.zig
+++ b/build.zig
@@ -52,7 +52,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(.Custom, "ReadMeStep", b.allocator, struct {
+    s.* = std.build.Step.init(.custom, "ReadMeStep", b.allocator, struct {
         fn make(step: *std.build.Step) anyerror!void {
             @setEvalBranchQuota(10000);
             _ = step;
diff --git a/clap.zig b/clap.zig
index b280f70..8b2357b 100644
--- a/clap.zig
+++ b/clap.zig
@@ -74,7 +74,7 @@ pub fn parseParam(line: []const u8) !Param(Help) {
     @setEvalBranchQuota(std.math.maxInt(u32));
 
     var found_comma = false;
-    var it = mem.tokenize(line, " \t");
+    var it = mem.tokenize(u8, line, " \t");
     var param_str = it.next() orelse return error.NoParamFound;
 
     const short_name = if (!mem.startsWith(u8, param_str, "--") and
@@ -337,7 +337,7 @@ pub const ParseOptions = struct {
     ///       `parse`, `parseEx` does not wrap the allocator so the heap allocator can be
     ///       quite expensive. (TODO: Can we pick a better default? For `parse`, this allocator
     ///       is fine, as it wraps it in an arena)
-    allocator: *mem.Allocator = heap.page_allocator,
+    allocator: mem.Allocator = heap.page_allocator,
     diagnostic: ?*Diagnostic = null,
 };
 
@@ -350,7 +350,7 @@ pub fn parse(
     var iter = try args.OsIterator.init(opt.allocator);
     const clap = try parseEx(Id, params, &iter, .{
         // Let's reuse the arena from the `OSIterator` since we already have it.
-        .allocator = &iter.arena.allocator,
+        .allocator = iter.arena.allocator(),
         .diagnostic = opt.diagnostic,
     });
 
@@ -409,7 +409,7 @@ pub fn helpFull(
         try printParam(cs.writer(), Id, param, Error, context, valueText);
         try stream.writeByteNTimes(' ', max_spacing - @intCast(usize, cs.bytes_written));
         const help_text = try helpText(context, param);
-        var help_text_line_it = mem.split(help_text, "\n");
+        var help_text_line_it = mem.split(u8, help_text, "\n");
         var indent_line = false;
         while (help_text_line_it.next()) |line| : (indent_line = true) {
             if (indent_line) {
diff --git a/clap/args.zig b/clap/args.zig
index a6be833..16299c8 100644
--- a/clap/args.zig
+++ b/clap/args.zig
@@ -57,7 +57,7 @@ pub const OsIterator = struct {
     ///       return an error when we have no exe.
     exe_arg: ?[:0]const u8,
 
-    pub fn init(allocator: *mem.Allocator) Error!OsIterator {
+    pub fn init(allocator: mem.Allocator) Error!OsIterator {
         var res = OsIterator{
             .arena = heap.ArenaAllocator.init(allocator),
             .args = process.args(),
@@ -73,7 +73,7 @@ pub const OsIterator = struct {
 
     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;
+            return try iter.args.next(iter.arena.allocator()) orelse return null;
         } else {
             return iter.args.nextPosix();
         }
@@ -91,7 +91,7 @@ pub const ShellIterator = struct {
     arena: heap.ArenaAllocator,
     str: []const u8,
 
-    pub fn init(allocator: *mem.Allocator, str: []const u8) ShellIterator {
+    pub fn init(allocator: mem.Allocator, str: []const u8) ShellIterator {
         return .{
             .arena = heap.ArenaAllocator.init(allocator),
             .str = str,
@@ -106,7 +106,7 @@ pub const ShellIterator = struct {
         // Whenever possible, this iterator will return slices into `str` instead of
         // allocating. Sometimes this is not possible, for example, escaped characters
         // have be be unescape, so we need to allocate in this case.
-        var list = std.ArrayList(u8).init(&iter.arena.allocator);
+        var list = std.ArrayList(u8).init(iter.arena.allocator());
         var start: usize = 0;
         var state: enum {
             skip_whitespace,
@@ -274,7 +274,7 @@ pub const ShellIterator = struct {
 
 fn testShellIteratorOk(str: []const u8, allocations: usize, expect: []const []const u8) !void {
     var allocator = testing.FailingAllocator.init(testing.allocator, allocations);
-    var it = ShellIterator.init(&allocator.allocator, str);
+    var it = ShellIterator.init(allocator.allocator(), str);
     defer it.deinit();
 
     for (expect) |e| {
diff --git a/clap/comptime.zig b/clap/comptime.zig
index a0f57ad..b440004 100644
--- a/clap/comptime.zig
+++ b/clap/comptime.zig
@@ -41,7 +41,7 @@ pub fn ComptimeClap(
         single_options_is_set: std.PackedIntArray(u1, single_options),
         flags: std.PackedIntArray(u1, flags),
         pos: []const []const u8,
-        allocator: *mem.Allocator,
+        allocator: mem.Allocator,
 
         pub fn parse(iter: anytype, opt: clap.ParseOptions) !@This() {
             const allocator = opt.allocator;
@@ -82,8 +82,8 @@ pub fn ComptimeClap(
                     if (multis.len != 0)
                         try multis[param.id].append(arg.value.?);
                 } else {
-                    debug.assert(res.flags.len() != 0);
-                    if (res.flags.len() != 0)
+                    debug.assert(res.flags.len != 0);
+                    if (res.flags.len != 0)
                         res.flags.set(param.id, 1);
                 }
             }
@@ -195,7 +195,7 @@ fn testErr(
 ) !void {
     var diag = clap.Diagnostic{};
     var iter = clap.args.SliceIterator{ .args = args_strings };
-    var args = clap.parseEx(u8, params, &iter, .{
+    _ = clap.parseEx(u8, params, &iter, .{
         .allocator = testing.allocator,
         .diagnostic = &diag,
     }) catch |err| {