From 53af0877444ea6c14b1ad5baec94afbeebc5e5e0 Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Thu, 28 Apr 2022 15:27:11 +0300 Subject: Added support for config files --- src/subcommand.zig | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/subcommand.zig') diff --git a/src/subcommand.zig b/src/subcommand.zig index ebd57ed..d750e94 100644 --- a/src/subcommand.zig +++ b/src/subcommand.zig @@ -2,8 +2,8 @@ const clap = @import("clap"); const std = @import("std"); const zup = @import("zup"); -const Allocator = std.mem.Allocator; const ArgIterator = std.process.ArgIterator; +const Config = zup.Config; const parsers = .{ .COMMAND = clap.parsers.string, @@ -35,7 +35,9 @@ pub fn SubCommand(comptime template: type) type { try writer.writeAll("\n" ++ template.description ++ "\n"); } - pub fn main(name: []const u8, allocator: Allocator, args: *ArgIterator) !void { + pub fn main(name: []const u8, config: Config, args: *ArgIterator) !void { + const allocator = config.allocator; + var diag = clap.Diagnostic{}; var res = clap.parseEx(clap.Help, ¶ms, parsers, args, .{ .allocator = allocator, @@ -60,11 +62,7 @@ pub fn SubCommand(comptime template: type) type { return error.ArgError; } - return template.main( - clap.ResultEx(clap.Help, ¶ms, parsers), - allocator, - res, - ); + return template.main(@TypeOf(res), config, res); } }; } -- cgit v1.2.3