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.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'clap.zig')

diff --git a/clap.zig b/clap.zig
index ee2dad8..5bb3542 100644
--- a/clap.zig
+++ b/clap.zig
@@ -110,7 +110,7 @@ pub fn parseParam(line: []const u8) !Param(Help) {
     } else null;
 
     var res = parseParamRest(it.rest());
-    res.names.long = param_str[2..];
+    res.names.long = long_name;
     res.names.short = short_name;
     return res;
 }
-- 
cgit v1.2.3


From c5fb22823a9a4a699acaefc1e9febfee0b8e506c Mon Sep 17 00:00:00 2001
From: Stephen Gregoratto
Date: Wed, 11 Aug 2021 10:06:28 +1000
Subject: Update calls to tokenizer

The tokenize function was made generic, so we have to pass the type as
the first parameter.
---
 clap.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'clap.zig')

diff --git a/clap.zig b/clap.zig
index 5bb3542..0bc711b 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
-- 
cgit v1.2.3


From 27899f951e94a67bf68d6dfebbf4ab9cf182d896 Mon Sep 17 00:00:00 2001
From: Ryan Liptak
Date: Sun, 5 Sep 2021 13:35:09 -0700
Subject: Update mem.split call for latest zig master

---
 clap.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'clap.zig')

diff --git a/clap.zig b/clap.zig
index e108c9b..69be5bd 100644
--- a/clap.zig
+++ b/clap.zig
@@ -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) {
-- 
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.zig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'clap.zig')

diff --git a/clap.zig b/clap.zig
index 69be5bd..8b2357b 100644
--- a/clap.zig
+++ b/clap.zig
@@ -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,
     });
 
-- 
cgit v1.2.3