diff options
Diffstat (limited to '')
| -rw-r--r-- | src/deps/zig-clap/clap/args.zig | 12 | ||||
| -rw-r--r-- | src/deps/zig-clap/clap/streaming.zig | 10 |
2 files changed, 9 insertions, 13 deletions
diff --git a/src/deps/zig-clap/clap/args.zig b/src/deps/zig-clap/clap/args.zig index c4b6c154e..6f98e33a6 100644 --- a/src/deps/zig-clap/clap/args.zig +++ b/src/deps/zig-clap/clap/args.zig @@ -46,7 +46,7 @@ test "SliceIterator" { /// An argument iterator which wraps the ArgIterator in ::std. /// On windows, this iterator allocates. pub const OsIterator = struct { - const Error = process.ArgIterator.NextError; + const Error = process.ArgIterator.InitError; arena: heap.ArenaAllocator, args: process.ArgIterator, @@ -62,7 +62,7 @@ pub const OsIterator = struct { .args = process.args(), .exe_arg = undefined, }; - res.exe_arg = try res.next(); + res.exe_arg = res.next(); return res; } @@ -70,12 +70,8 @@ pub const OsIterator = struct { iter.arena.deinit(); } - pub fn next(iter: *OsIterator) Error!?[:0]const u8 { - if (builtin.os.tag == .windows) { - return try iter.args.next(&iter.arena.allocator) orelse return null; - } else { - return iter.args.nextPosix(); - } + pub fn next(iter: *OsIterator) ?[:0]const u8 { + return iter.args.next(); } }; diff --git a/src/deps/zig-clap/clap/streaming.zig b/src/deps/zig-clap/clap/streaming.zig index 702e9e6d5..e3948e33b 100644 --- a/src/deps/zig-clap/clap/streaming.zig +++ b/src/deps/zig-clap/clap/streaming.zig @@ -49,7 +49,7 @@ pub fn StreamingClap(comptime Id: type, comptime ArgIterator: type) type { .chaining => |state| return try parser.chainging(state), .rest_are_positional => { const param = parser.positionalParam() orelse unreachable; - const value = (try parser.iter.next()) orelse return null; + const value = parser.iter.next() orelse return null; return Arg(Id){ .param = param, .value = value }; }, } @@ -82,7 +82,7 @@ pub fn StreamingClap(comptime Id: type, comptime ArgIterator: type) type { if (maybe_value) |v| break :blk v; - break :blk (try parser.iter.next()) orelse brk2: { + break :blk parser.iter.next() orelse brk2: { if (param.takes_value != .one_optional) return parser.err(arg, .{ .long = name }, error.MissingValue); @@ -105,7 +105,7 @@ pub fn StreamingClap(comptime Id: type, comptime ArgIterator: type) type { // arguments. if (mem.eql(u8, arg, "--")) { parser.state = .rest_are_positional; - const value = (try parser.iter.next()) orelse return null; + const value = parser.iter.next() orelse return null; return Arg(Id){ .param = param, .value = value }; } @@ -148,7 +148,7 @@ pub fn StreamingClap(comptime Id: type, comptime ArgIterator: type) type { } if (arg.len <= next_index) { - const value = (try parser.iter.next()) orelse + const value = parser.iter.next() orelse return parser.err(arg, .{ .short = short }, error.MissingValue); return Arg(Id){ .param = param, .value = value }; @@ -190,7 +190,7 @@ pub fn StreamingClap(comptime Id: type, comptime ArgIterator: type) type { }; fn parseNextArg(parser: *@This()) !?ArgInfo { - const full_arg = (try parser.iter.next()) orelse return null; + const full_arg = parser.iter.next() orelse return null; if (mem.eql(u8, full_arg, "--") or mem.eql(u8, full_arg, "-")) return ArgInfo{ .arg = full_arg, .kind = .positional }; if (mem.startsWith(u8, full_arg, "--")) |