From e7822aaf172704c557ad063468b2229131ce2aef Mon Sep 17 00:00:00 2001
From: Komari Spaghetti
Date: Thu, 24 Jun 2021 17:36:35 +0200
Subject: Fix all new compiler errors from zig master

---
 clap/args.zig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'clap/args.zig')

diff --git a/clap/args.zig b/clap/args.zig
index d848eb7..1d93189 100644
--- a/clap/args.zig
+++ b/clap/args.zig
@@ -12,6 +12,7 @@ pub const ExampleArgIterator = struct {
     const Error = error{};
 
     pub fn next(iter: *ExampleArgIterator) Error!?[]const u8 {
+        _ = iter;
         return "2";
     }
 };
-- 
cgit v1.2.3


From 7fe9b7c18c6810bdfb1448a19a8c08a6a1c5f557 Mon Sep 17 00:00:00 2001
From: Asherah Connor
Date: Mon, 11 Oct 2021 14:54:59 +1100
Subject: zig master updates

---
 clap/args.zig | 1 +
 1 file changed, 1 insertion(+)

(limited to 'clap/args.zig')

diff --git a/clap/args.zig b/clap/args.zig
index a6be833..dd97d24 100644
--- a/clap/args.zig
+++ b/clap/args.zig
@@ -1,5 +1,6 @@
 const builtin = @import("builtin");
 const std = @import("std");
+const builtin = @import("builtin");
 
 const debug = std.debug;
 const heap = std.heap;
-- 
cgit v1.2.3


From 844c9370bcecf063daff697f296d6ae979190649 Mon Sep 17 00:00:00 2001
From: Komari Spaghetti
Date: Mon, 11 Oct 2021 09:16:56 +0200
Subject: Fix regression in last commit

The importing of builtin was already fixed, so the latest commit applied
this fix again, which caused problems
---
 clap/args.zig | 1 -
 1 file changed, 1 deletion(-)

(limited to 'clap/args.zig')

diff --git a/clap/args.zig b/clap/args.zig
index dd97d24..a6be833 100644
--- a/clap/args.zig
+++ b/clap/args.zig
@@ -1,6 +1,5 @@
 const builtin = @import("builtin");
 const std = @import("std");
-const builtin = @import("builtin");
 
 const debug = std.debug;
 const heap = std.heap;
-- 
cgit v1.2.3


From cf8a34d11f0520bdf2afc08eda88862597a88b23 Mon Sep 17 00:00:00 2001
From: Asherah Connor
Date: Mon, 6 Dec 2021 20:18:55 +1100
Subject: zig master updates: allocator changes (#60)

---
 clap/args.zig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'clap/args.zig')

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| {
-- 
cgit v1.2.3