More fixes.

This commit is contained in:
Lyssieth 2026-01-06 08:11:06 +02:00
parent 701da7746d
commit 80d398f540
Signed by untrusted user who does not match committer: lyssieth
GPG key ID: 6EE87E973D3AA8F2
2 changed files with 19 additions and 18 deletions

View file

@ -66,7 +66,7 @@ pub fn parseArgs(comptime T: type, allocator: Allocator) !T {
/// Do not pass the process name as an argument. /// Do not pass the process name as an argument.
/// ///
/// Parsing order of arguments is based on the order they are declared in `T`. /// Parsing order of arguments is based on the order they are declared in `T`.
pub fn parseArgsFromSlice(comptime T: type, allocator: Allocator, args: [][]const u8) !T { pub fn parseArgsFromSlice(comptime T: type, allocator: Allocator, args: [][:0]const u8) !T {
var flags = try std.ArrayList(Arg).initCapacity(allocator, 4); var flags = try std.ArrayList(Arg).initCapacity(allocator, 4);
defer flags.deinit(allocator); defer flags.deinit(allocator);
@ -383,7 +383,7 @@ fn initFromParsed(comptime T: type, allocator: Allocator, flags: []Arg) !T {
const t = std.testing; const t = std.testing;
test "parse args" { test "parse args" {
const args = try t.allocator.alloc([]const u8, 4); const args = try t.allocator.alloc([:0]const u8, 4);
defer t.allocator.free(args); defer t.allocator.free(args);
const Demo = struct { const Demo = struct {
@ -433,7 +433,7 @@ test "parse args" {
} }
test "missing flag" { test "missing flag" {
const args = try t.allocator.alloc([]const u8, 1); const args = try t.allocator.alloc([:0]const u8, 1);
defer t.allocator.free(args); defer t.allocator.free(args);
args[0] = "1234"; args[0] = "1234";
@ -461,7 +461,7 @@ test "missing flag" {
} }
test "missing toggle" { test "missing toggle" {
const args = try t.allocator.alloc([]const u8, 1); const args = try t.allocator.alloc([:0]const u8, 1);
defer t.allocator.free(args); defer t.allocator.free(args);
args[0] = "1234"; args[0] = "1234";
@ -489,7 +489,7 @@ test "missing toggle" {
} }
test "missing positional because no args" { test "missing positional because no args" {
const args = try t.allocator.alloc([]const u8, 0); const args = try t.allocator.alloc([:0]const u8, 0);
defer t.allocator.free(args); defer t.allocator.free(args);
const Demo = struct { const Demo = struct {
@ -511,7 +511,7 @@ test "missing positional because no args" {
} }
test "missing positional because empty arg" { test "missing positional because empty arg" {
const args = try t.allocator.alloc([]const u8, 1); const args = try t.allocator.alloc([:0]const u8, 1);
defer t.allocator.free(args); defer t.allocator.free(args);
args[0] = ""; args[0] = "";
@ -535,7 +535,7 @@ test "missing positional because empty arg" {
} }
test "positional has default value so we get a free pass" { test "positional has default value so we get a free pass" {
const args = try t.allocator.alloc([]const u8, 1); const args = try t.allocator.alloc([:0]const u8, 1);
defer t.allocator.free(args); defer t.allocator.free(args);
args[0] = "--toggle"; args[0] = "--toggle";
@ -562,7 +562,7 @@ test "positional has default value so we get a free pass" {
} }
test "parse fn (positional)" { test "parse fn (positional)" {
const args = try t.allocator.alloc([]const u8, 3); const args = try t.allocator.alloc([:0]const u8, 3);
defer t.allocator.free(args); defer t.allocator.free(args);
args[0] = "1234"; args[0] = "1234";
@ -612,7 +612,7 @@ test "parse fn (positional)" {
} }
test "parse fn (flag)" { test "parse fn (flag)" {
const args = try t.allocator.alloc([]const u8, 3); const args = try t.allocator.alloc([:0]const u8, 3);
defer t.allocator.free(args); defer t.allocator.free(args);
args[0] = "--number=1234"; args[0] = "--number=1234";
@ -671,7 +671,7 @@ test "parse fn (flag)" {
} }
test "parse failure because no args" { test "parse failure because no args" {
const args = try t.allocator.alloc([]const u8, 0); const args = try t.allocator.alloc([:0]const u8, 0);
defer t.allocator.free(args); defer t.allocator.free(args);
const Demo = struct { const Demo = struct {
@ -688,7 +688,7 @@ test "parse failure because no args" {
} }
test "remainder has value" { test "remainder has value" {
const args = try t.allocator.alloc([]const u8, 3); const args = try t.allocator.alloc([:0]const u8, 3);
defer t.allocator.free(args); defer t.allocator.free(args);
args[0] = "--flag=value"; args[0] = "--flag=value";
@ -721,7 +721,7 @@ test "remainder has value" {
} }
test "sub command from remainder" { test "sub command from remainder" {
const args = try t.allocator.alloc([]const u8, 3); const args = try t.allocator.alloc([:0]const u8, 3);
defer t.allocator.free(args); defer t.allocator.free(args);
args[0] = "--flag=value"; args[0] = "--flag=value";
@ -785,7 +785,13 @@ test "sub command from remainder" {
} }
}; };
var innerResult = try parseArgsFromSlice(DemoInner, t.allocator, outerResult.remainder.value.items); const outerItems = outerResult.remainder.value.items;
var innerResult = try parseArgsFromSlice(
DemoInner,
t.allocator,
@ptrCast(outerItems),
);
defer innerResult.deinit(); defer innerResult.deinit();
try t.expectEqualStrings("value", innerResult.flag.value); try t.expectEqualStrings("value", innerResult.flag.value);

View file

@ -7,10 +7,6 @@ pub fn niceTypeName(comptime T: type) []const u8 {
const name = @typeName(T); const name = @typeName(T);
if (std.mem.startsWith(u8, name, "array_list.Aligned")) {
return "array";
}
if (std.mem.lastIndexOf(u8, name, ".")) |idx| { if (std.mem.lastIndexOf(u8, name, ".")) |idx| {
return name[idx + 1 ..]; return name[idx + 1 ..];
} }
@ -27,7 +23,6 @@ test "nice type names" {
}; };
try t.expectEqualStrings("string", niceTypeName([]const u8)); try t.expectEqualStrings("string", niceTypeName([]const u8));
try t.expectEqualStrings("array", niceTypeName(std.ArrayList(u8)));
try t.expectEqualStrings("Enum", niceTypeName(Enum)); try t.expectEqualStrings("Enum", niceTypeName(Enum));
try t.expectEqualStrings("u8", niceTypeName(u8)); try t.expectEqualStrings("u8", niceTypeName(u8));