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/comptime.zig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'clap/comptime.zig')

diff --git a/clap/comptime.zig b/clap/comptime.zig
index cbc872e..0328997 100644
--- a/clap/comptime.zig
+++ b/clap/comptime.zig
@@ -11,10 +11,10 @@ pub fn ComptimeClap(
     comptime Id: type,
     comptime params: []const clap.Param(Id),
 ) type {
-    var flags: usize = 0;
-    var single_options: usize = 0;
-    var multi_options: usize = 0;
-    var converted_params: []const clap.Param(usize) = &.{};
+    comptime var flags: usize = 0;
+    comptime var single_options: usize = 0;
+    comptime var multi_options: usize = 0;
+    comptime var converted_params: []const clap.Param(usize) = &.{};
     for (params) |param| {
         var index: usize = 0;
         if (param.names.long != null or param.names.short != null) {
-- 
cgit v1.2.3


From 8b51a3d857c2714c46a3d2aaef6c47239575047d Mon Sep 17 00:00:00 2001
From: Sirius902
Date: Sat, 24 Jul 2021 16:44:30 -0700
Subject: Discard unused variable

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

(limited to 'clap/comptime.zig')

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

(limited to 'clap/comptime.zig')

diff --git a/clap/comptime.zig b/clap/comptime.zig
index 1050861..bc6907a 100644
--- a/clap/comptime.zig
+++ b/clap/comptime.zig
@@ -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);
                 }
             }
-- 
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/comptime.zig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'clap/comptime.zig')

diff --git a/clap/comptime.zig b/clap/comptime.zig
index bc6907a..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;
-- 
cgit v1.2.3