From d02219c58fe2487139da712e2c93d28078b096d1 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

---
 build.zig         | 1 +
 clap.zig          | 2 +-
 clap/args.zig     | 1 +
 clap/comptime.zig | 8 ++++----
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.zig b/build.zig
index 5cbc731..fcb72b5 100644
--- a/build.zig
+++ b/build.zig
@@ -56,6 +56,7 @@ fn readMeStep(b: *Builder) *std.build.Step {
     s.* = std.build.Step.init(.Custom, "ReadMeStep", b.allocator, struct {
         fn make(step: *std.build.Step) anyerror!void {
             @setEvalBranchQuota(10000);
+            _ = step;
             const file = try std.fs.cwd().createFile("README.md", .{});
             const stream = file.writer();
             try stream.print(@embedFile("example/README.md.template"), .{
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;
 }
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";
     }
 };
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