summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jimmi Holst Christensen2019-12-11 08:40:24 +0100
committerGravatar GitHub2019-12-11 08:40:24 +0100
commit98b4a1088256dceec9b2a76e47d6e9c7e8043377 (patch)
treeac893e1d6d3da5bbee29a3bd705aebde8ceb1060
parentMerge pull request #13 from dbandstra/update-for-varargs-removal (diff)
parentupdate for latest zig (typeOf was renamed) (diff)
downloadzig-clap-98b4a1088256dceec9b2a76e47d6e9c7e8043377.tar.gz
zig-clap-98b4a1088256dceec9b2a76e47d6e9c7e8043377.tar.xz
zig-clap-98b4a1088256dceec9b2a76e47d6e9c7e8043377.zip
Merge pull request #14 from dbandstra/update-for-typeof-rename
update for latest zig (typeOf was renamed)
-rw-r--r--clap.zig10
-rw-r--r--clap/streaming.zig2
2 files changed, 6 insertions, 6 deletions
diff --git a/clap.zig b/clap.zig
index a300266..3d5b60b 100644
--- a/clap.zig
+++ b/clap.zig
@@ -276,8 +276,8 @@ pub fn helpFull(
276 params: []const Param(Id), 276 params: []const Param(Id),
277 comptime Error: type, 277 comptime Error: type,
278 context: var, 278 context: var,
279 help_text: fn (@typeOf(context), Param(Id)) Error![]const u8, 279 help_text: fn (@TypeOf(context), Param(Id)) Error![]const u8,
280 value_text: fn (@typeOf(context), Param(Id)) Error![]const u8, 280 value_text: fn (@TypeOf(context), Param(Id)) Error![]const u8,
281) !void { 281) !void {
282 const max_spacing = blk: { 282 const max_spacing = blk: {
283 var res: usize = 0; 283 var res: usize = 0;
@@ -295,7 +295,7 @@ pub fn helpFull(
295 if (param.names.short == null and param.names.long == null) 295 if (param.names.short == null and param.names.long == null)
296 continue; 296 continue;
297 297
298 var counting_stream = io.CountingOutStream(@typeOf(stream.*).Error).init(stream); 298 var counting_stream = io.CountingOutStream(@TypeOf(stream.*).Error).init(stream);
299 try stream.print("\t", .{}); 299 try stream.print("\t", .{});
300 try printParam(&counting_stream.stream, Id, param, Error, context, value_text); 300 try printParam(&counting_stream.stream, Id, param, Error, context, value_text);
301 try stream.writeByteNTimes(' ', max_spacing - counting_stream.bytes_written); 301 try stream.writeByteNTimes(' ', max_spacing - counting_stream.bytes_written);
@@ -309,8 +309,8 @@ fn printParam(
309 param: Param(Id), 309 param: Param(Id),
310 comptime Error: type, 310 comptime Error: type,
311 context: var, 311 context: var,
312 value_text: fn (@typeOf(context), Param(Id)) Error![]const u8, 312 value_text: fn (@TypeOf(context), Param(Id)) Error![]const u8,
313) @typeOf(stream.*).Error!void { 313) @TypeOf(stream.*).Error!void {
314 if (param.names.short) |s| { 314 if (param.names.short) |s| {
315 try stream.print("-{c}", .{ s }); 315 try stream.print("-{c}", .{ s });
316 } else { 316 } else {
diff --git a/clap/streaming.zig b/clap/streaming.zig
index 3678917..95ee581 100644
--- a/clap/streaming.zig
+++ b/clap/streaming.zig
@@ -170,7 +170,7 @@ fn testNoErr(params: []const clap.Param(u8), args_strings: []const []const u8, r
170 const arg = (c.next() catch unreachable) orelse unreachable; 170 const arg = (c.next() catch unreachable) orelse unreachable;
171 testing.expectEqual(res.param, arg.param); 171 testing.expectEqual(res.param, arg.param);
172 const expected_value = res.value orelse { 172 const expected_value = res.value orelse {
173 testing.expectEqual(@as(@typeOf(arg.value), null), arg.value); 173 testing.expectEqual(@as(@TypeOf(arg.value), null), arg.value);
174 continue; 174 continue;
175 }; 175 };
176 const actual_value = arg.value orelse unreachable; 176 const actual_value = arg.value orelse unreachable;