Rename a couple functions to be inline with what's expected

And also remove an unneeded `unreachable`
This commit is contained in:
Lyssieth 2024-12-07 04:26:24 +02:00
parent 54a060d4ca
commit 6dff5b60e5
Signed by untrusted user who does not match committer: lyssieth
GPG key ID: 200268854934CFAB
2 changed files with 5 additions and 7 deletions

View file

@ -29,12 +29,12 @@ pub const Arg = union(enum(u2)) {
}; };
} }
pub fn parse_arg(arg: []const u8) !Arg { pub fn parseArg(arg: []const u8) !Arg {
var flag: ?Arg = null; var flag: ?Arg = null;
if (std.mem.startsWith(u8, arg, "--")) { if (std.mem.startsWith(u8, arg, "--")) {
flag = try Arg.parse_flag(arg[2..]); flag = try Arg.parseFlag(arg[2..]);
} else if (std.mem.startsWith(u8, arg, "-")) { } else if (std.mem.startsWith(u8, arg, "-")) {
flag = try Arg.parse_flag(arg[1..]); flag = try Arg.parseFlag(arg[1..]);
flag.?.Flag.short = true; flag.?.Flag.short = true;
} }
@ -49,7 +49,7 @@ pub const Arg = union(enum(u2)) {
}; };
} }
fn parse_flag(arg: []const u8) !Arg { fn parseFlag(arg: []const u8) !Arg {
if (arg.len == 0) { if (arg.len == 0) {
return error.EmptyFlag; return error.EmptyFlag;
} }

View file

@ -78,7 +78,7 @@ pub fn parseArgsFromSlice(comptime T: type, allocator: Allocator, args: [][]cons
if (arg.len == 0) continue; // skip empty args if (arg.len == 0) continue; // skip empty args
if (@intFromPtr(arg.ptr) == 0xaaaaaaaaaaaaaaaa) return error.UninitializedArgument; if (@intFromPtr(arg.ptr) == 0xaaaaaaaaaaaaaaaa) return error.UninitializedArgument;
const argument = try Arg.parse_arg(arg); const argument = try Arg.parseArg(arg);
try flags.append(argument); try flags.append(argument);
} }
@ -230,8 +230,6 @@ fn initFromParsed(comptime T: type, allocator: Allocator, flags: []Arg) !T {
}); });
return error.NoValueForFlag; return error.NoValueForFlag;
} }
unreachable;
} }
} else { } else {
log.err("flag `{s}` expected a value, but none was provided", .{f.name}); log.err("flag `{s}` expected a value, but none was provided", .{f.name});