From 54674fe7c9092d0a9cc91948198b0c0a65c5310d Mon Sep 17 00:00:00 2001 From: jiacai2050 Date: Mon, 5 Aug 2024 22:27:32 +0800 Subject: [PATCH 1/2] keep up with upstream --- .tool-versions | 2 +- src/bin/tree.zig | 2 +- src/mod/simargs.zig | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.tool-versions b/.tool-versions index 02050d7..f81adbc 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -zig 0.13.0 +zig master diff --git a/src/bin/tree.zig b/src/bin/tree.zig index 7a09746..d773919 100644 --- a/src/bin/tree.zig +++ b/src/bin/tree.zig @@ -202,7 +202,7 @@ fn walk( } }.lessThan); - var buf: [fs.MAX_PATH_BYTES]u8 = undefined; + var buf: [fs.max_path_bytes]u8 = undefined; for (files.items, 0..) |entry, i| { _ = try writer.write(prefix); diff --git a/src/mod/simargs.zig b/src/mod/simargs.zig index a4811e3..e3af775 100644 --- a/src/mod/simargs.zig +++ b/src/mod/simargs.zig @@ -617,10 +617,10 @@ test "parse/valid option values" { \\ awesome-cli [OPTIONS] [--] ... \\ \\ OPTIONS: - \\ -h, --help print this help message(required) - \\ -r, --rate FLOAT (default: 2e0) - \\ --timeout INTEGER (required) - \\ --user-agent STRING (default: Brave) + \\ -h, --help print this help message(required) + \\ -r, --rate FLOAT (default: 2e0) + \\ --timeout INTEGER (required) + \\ --user-agent STRING (default: Brave) \\ , help_msg.items); } @@ -775,14 +775,14 @@ test "parse/default value" { \\ awesome-cli [OPTIONS] [--] ... \\ \\ OPTIONS: - \\ --a1 STRING (default: A1) - \\ --a2 STRING (default: A2) - \\ --b1 INTEGER (default: 1) - \\ --b2 INTEGER (default: 11) - \\ --c1 FLOAT (default: 1.5e0) - \\ --c2 FLOAT (default: 2.5e0) - \\ --d1 (default: true) - \\ --d2 padding message + \\ --a1 STRING (default: A1) + \\ --a2 STRING (default: A2) + \\ --b1 INTEGER (default: 1) + \\ --b2 INTEGER (default: 11) + \\ --c1 FLOAT (default: 1.5e0) + \\ --c2 FLOAT (default: 2.5e0) + \\ --d1 (default: true) + \\ --d2 padding message \\ , help_msg.items); } @@ -814,9 +814,9 @@ test "parse/enum option" { \\ awesome-cli [OPTIONS] [--] ... \\ \\ OPTIONS: - \\ --a1 STRING (valid: A|B)(default: A) - \\ --a2 STRING (valid: C|D)(default: D) - \\ --a3 STRING (valid: X|Y)(required) + \\ --a1 STRING (valid: A|B)(default: A) + \\ --a2 STRING (valid: C|D)(default: D) + \\ --a3 STRING (valid: X|Y)(required) \\ , help_msg.items); } @@ -850,7 +850,7 @@ test "parse/positional arguments" { \\ awesome-cli [OPTIONS] [--] ... \\ \\ OPTIONS: - \\ --a INTEGER (default: 1) + \\ --a INTEGER (default: 1) \\ , help_msg.items); } From bda99621c63c2ca44c0c17bc7dc1011764441cbc Mon Sep 17 00:00:00 2001 From: jiacai2050 Date: Tue, 6 Aug 2024 08:36:35 +0800 Subject: [PATCH 2/2] fix tests --- src/mod/simargs.zig | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/mod/simargs.zig b/src/mod/simargs.zig index e3af775..b3a6dfc 100644 --- a/src/mod/simargs.zig +++ b/src/mod/simargs.zig @@ -215,7 +215,7 @@ fn StructArguments( var curr_opt = std.ArrayList([]const u8).init(self.allocator); defer curr_opt.deinit(); - try curr_opt.append("\t"); + try curr_opt.append(" "); if (opt_fld.short_name) |sn| { try curr_opt.append("-"); try curr_opt.append(&[_]u8{sn}); @@ -617,10 +617,10 @@ test "parse/valid option values" { \\ awesome-cli [OPTIONS] [--] ... \\ \\ OPTIONS: - \\ -h, --help print this help message(required) - \\ -r, --rate FLOAT (default: 2e0) - \\ --timeout INTEGER (required) - \\ --user-agent STRING (default: Brave) + \\ -h, --help print this help message(required) + \\ -r, --rate FLOAT (default: 2e0) + \\ --timeout INTEGER (required) + \\ --user-agent STRING (default: Brave) \\ , help_msg.items); } @@ -775,14 +775,14 @@ test "parse/default value" { \\ awesome-cli [OPTIONS] [--] ... \\ \\ OPTIONS: - \\ --a1 STRING (default: A1) - \\ --a2 STRING (default: A2) - \\ --b1 INTEGER (default: 1) - \\ --b2 INTEGER (default: 11) - \\ --c1 FLOAT (default: 1.5e0) - \\ --c2 FLOAT (default: 2.5e0) - \\ --d1 (default: true) - \\ --d2 padding message + \\ --a1 STRING (default: A1) + \\ --a2 STRING (default: A2) + \\ --b1 INTEGER (default: 1) + \\ --b2 INTEGER (default: 11) + \\ --c1 FLOAT (default: 1.5e0) + \\ --c2 FLOAT (default: 2.5e0) + \\ --d1 (default: true) + \\ --d2 padding message \\ , help_msg.items); } @@ -814,9 +814,9 @@ test "parse/enum option" { \\ awesome-cli [OPTIONS] [--] ... \\ \\ OPTIONS: - \\ --a1 STRING (valid: A|B)(default: A) - \\ --a2 STRING (valid: C|D)(default: D) - \\ --a3 STRING (valid: X|Y)(required) + \\ --a1 STRING (valid: A|B)(default: A) + \\ --a2 STRING (valid: C|D)(default: D) + \\ --a3 STRING (valid: X|Y)(required) \\ , help_msg.items); } @@ -850,7 +850,7 @@ test "parse/positional arguments" { \\ awesome-cli [OPTIONS] [--] ... \\ \\ OPTIONS: - \\ --a INTEGER (default: 1) + \\ --a INTEGER (default: 1) \\ , help_msg.items); }