diff options
| author | 2021-06-24 17:36:35 +0200 | |
|---|---|---|
| committer | 2021-06-24 17:36:35 +0200 | |
| commit | e7822aaf172704c557ad063468b2229131ce2aef (patch) | |
| tree | 2c45502a1f6a5eb009d1d536714a0adda9d2a3d4 | |
| parent | Build buildscript with latest version of zig (diff) | |
| download | zig-clap-e7822aaf172704c557ad063468b2229131ce2aef.tar.gz zig-clap-e7822aaf172704c557ad063468b2229131ce2aef.tar.xz zig-clap-e7822aaf172704c557ad063468b2229131ce2aef.zip | |
Fix all new compiler errors from zig master
| -rw-r--r-- | build.zig | 1 | ||||
| -rw-r--r-- | clap.zig | 2 | ||||
| -rw-r--r-- | clap/args.zig | 1 | ||||
| -rw-r--r-- | clap/comptime.zig | 8 |
4 files changed, 7 insertions, 5 deletions
| @@ -56,6 +56,7 @@ fn readMeStep(b: *Builder) *std.build.Step { | |||
| 56 | s.* = std.build.Step.init(.custom, "ReadMeStep", b.allocator, struct { | 56 | s.* = std.build.Step.init(.custom, "ReadMeStep", b.allocator, struct { |
| 57 | fn make(step: *std.build.Step) anyerror!void { | 57 | fn make(step: *std.build.Step) anyerror!void { |
| 58 | @setEvalBranchQuota(10000); | 58 | @setEvalBranchQuota(10000); |
| 59 | _ = step; | ||
| 59 | const file = try std.fs.cwd().createFile("README.md", .{}); | 60 | const file = try std.fs.cwd().createFile("README.md", .{}); |
| 60 | const stream = file.writer(); | 61 | const stream = file.writer(); |
| 61 | try stream.print(@embedFile("example/README.md.template"), .{ | 62 | try stream.print(@embedFile("example/README.md.template"), .{ |
| @@ -110,7 +110,7 @@ pub fn parseParam(line: []const u8) !Param(Help) { | |||
| 110 | } else null; | 110 | } else null; |
| 111 | 111 | ||
| 112 | var res = parseParamRest(it.rest()); | 112 | var res = parseParamRest(it.rest()); |
| 113 | res.names.long = param_str[2..]; | 113 | res.names.long = long_name; |
| 114 | res.names.short = short_name; | 114 | res.names.short = short_name; |
| 115 | return res; | 115 | return res; |
| 116 | } | 116 | } |
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 { | |||
| 12 | const Error = error{}; | 12 | const Error = error{}; |
| 13 | 13 | ||
| 14 | pub fn next(iter: *ExampleArgIterator) Error!?[]const u8 { | 14 | pub fn next(iter: *ExampleArgIterator) Error!?[]const u8 { |
| 15 | _ = iter; | ||
| 15 | return "2"; | 16 | return "2"; |
| 16 | } | 17 | } |
| 17 | }; | 18 | }; |
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( | |||
| 11 | comptime Id: type, | 11 | comptime Id: type, |
| 12 | comptime params: []const clap.Param(Id), | 12 | comptime params: []const clap.Param(Id), |
| 13 | ) type { | 13 | ) type { |
| 14 | var flags: usize = 0; | 14 | comptime var flags: usize = 0; |
| 15 | var single_options: usize = 0; | 15 | comptime var single_options: usize = 0; |
| 16 | var multi_options: usize = 0; | 16 | comptime var multi_options: usize = 0; |
| 17 | var converted_params: []const clap.Param(usize) = &.{}; | 17 | comptime var converted_params: []const clap.Param(usize) = &.{}; |
| 18 | for (params) |param| { | 18 | for (params) |param| { |
| 19 | var index: usize = 0; | 19 | var index: usize = 0; |
| 20 | if (param.names.long != null or param.names.short != null) { | 20 | if (param.names.long != null or param.names.short != null) { |