From 554a7a5e7898bafb0cd6d312fe4c145eb12ef0bc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 2 Nov 2026 05:08:11 +0000 Subject: [PATCH] chore(builtins): sync uutils/coreutils argument surfaces and vendored modules Regenerated by `bashkit-coreutils-port` against uutils/coreutils@9cc868bca. Utilities: cat ls mktemp od readlink realpath shuf stat tac tee truncate Vendored modules: format --- .../src/builtins/generated/cat_args.rs | 2 +- .../builtins/generated/extendedbigdecimal.rs | 2 +- .../src/builtins/generated/format/argument.rs | 2 +- .../src/builtins/generated/format/escape.rs | 2 +- .../src/builtins/generated/format/human.rs | 2 +- .../src/builtins/generated/format/mod.rs | 2 +- .../builtins/generated/format/num_format.rs | 2 +- .../src/builtins/generated/format/spec.rs | 21 ++++++++++--------- .../bashkit/src/builtins/generated/ls_args.rs | 2 +- .../src/builtins/generated/mktemp_args.rs | 2 +- crates/bashkit/src/builtins/generated/mod.rs | 2 +- .../src/builtins/generated/num_parser.rs | 2 +- .../bashkit/src/builtins/generated/od_args.rs | 2 +- .../src/builtins/generated/readlink_args.rs | 2 +- .../src/builtins/generated/realpath_args.rs | 2 +- .../src/builtins/generated/shuf_args.rs | 2 +- .../src/builtins/generated/stat_args.rs | 2 +- .../src/builtins/generated/tac_args.rs | 3 ++- .../src/builtins/generated/tee_args.rs | 2 +- .../src/builtins/generated/truncate_args.rs | 2 +- 20 files changed, 31 insertions(+), 29 deletions(-) diff --git a/crates/bashkit/src/builtins/generated/cat_args.rs b/crates/bashkit/src/builtins/generated/cat_args.rs index ec4eb5483..b384fef0e 100644 --- a/crates/bashkit/src/builtins/generated/cat_args.rs +++ b/crates/bashkit/src/builtins/generated/cat_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/cat/ +// Source: uutils/coreutils@9cc868bca src/uu/cat/ // Regenerate: cargo run -p bashkit-coreutils-port -- cat // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/extendedbigdecimal.rs b/crates/bashkit/src/builtins/generated/extendedbigdecimal.rs index 410292c4e..63b275feb 100644 --- a/crates/bashkit/src/builtins/generated/extendedbigdecimal.rs +++ b/crates/bashkit/src/builtins/generated/extendedbigdecimal.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uucore/src/lib/features/extendedbigdecimal.rs +// Source: uutils/coreutils@9cc868bca src/uucore/src/lib/features/extendedbigdecimal.rs // Regenerate: cargo run -p bashkit-coreutils-port -- port-module format // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/format/argument.rs b/crates/bashkit/src/builtins/generated/format/argument.rs index 1fa5ebee5..b432e68bf 100644 --- a/crates/bashkit/src/builtins/generated/format/argument.rs +++ b/crates/bashkit/src/builtins/generated/format/argument.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uucore/src/lib/features/format/argument.rs +// Source: uutils/coreutils@9cc868bca src/uucore/src/lib/features/format/argument.rs // Regenerate: cargo run -p bashkit-coreutils-port -- port-module format // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/format/escape.rs b/crates/bashkit/src/builtins/generated/format/escape.rs index eff3f0d63..1303111bf 100644 --- a/crates/bashkit/src/builtins/generated/format/escape.rs +++ b/crates/bashkit/src/builtins/generated/format/escape.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uucore/src/lib/features/format/escape.rs +// Source: uutils/coreutils@9cc868bca src/uucore/src/lib/features/format/escape.rs // Regenerate: cargo run -p bashkit-coreutils-port -- port-module format // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/format/human.rs b/crates/bashkit/src/builtins/generated/format/human.rs index 7cbe90877..181b94e54 100644 --- a/crates/bashkit/src/builtins/generated/format/human.rs +++ b/crates/bashkit/src/builtins/generated/format/human.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uucore/src/lib/features/format/human.rs +// Source: uutils/coreutils@9cc868bca src/uucore/src/lib/features/format/human.rs // Regenerate: cargo run -p bashkit-coreutils-port -- port-module format // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/format/mod.rs b/crates/bashkit/src/builtins/generated/format/mod.rs index 280fbd399..0ce6c552d 100644 --- a/crates/bashkit/src/builtins/generated/format/mod.rs +++ b/crates/bashkit/src/builtins/generated/format/mod.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uucore/src/lib/features/format/mod.rs +// Source: uutils/coreutils@9cc868bca src/uucore/src/lib/features/format/mod.rs // Regenerate: cargo run -p bashkit-coreutils-port -- port-module format // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/format/num_format.rs b/crates/bashkit/src/builtins/generated/format/num_format.rs index 610e5a83f..4960cfe54 100644 --- a/crates/bashkit/src/builtins/generated/format/num_format.rs +++ b/crates/bashkit/src/builtins/generated/format/num_format.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uucore/src/lib/features/format/num_format.rs +// Source: uutils/coreutils@9cc868bca src/uucore/src/lib/features/format/num_format.rs // Regenerate: cargo run -p bashkit-coreutils-port -- port-module format // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/format/spec.rs b/crates/bashkit/src/builtins/generated/format/spec.rs index 7258f5956..441737d5f 100644 --- a/crates/bashkit/src/builtins/generated/format/spec.rs +++ b/crates/bashkit/src/builtins/generated/format/spec.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uucore/src/lib/features/format/spec.rs +// Source: uutils/coreutils@9cc868bca src/uucore/src/lib/features/format/spec.rs // Regenerate: cargo run -p bashkit-coreutils-port -- port-module format // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. @@ -322,7 +322,7 @@ impl Spec { position, } => { let (width, neg_width) = resolve_asterisk_width(*width, args).unwrap_or_default(); - let precision = resolve_asterisk_precision(*precision, args); + let precision = resolve_asterisk_precision(*precision, args)?; let os_str = args.next_string(*position); let bytes = os_str_as_bytes(os_str)?; let truncated = match precision { @@ -362,7 +362,7 @@ impl Spec { position, } => { let (width, neg_width) = resolve_asterisk_width(*width, args).unwrap_or((0, false)); - let precision = resolve_asterisk_precision(*precision, args); + let precision = resolve_asterisk_precision(*precision, args)?; let i = args.next_i64(*position); if let Some(precision) = precision { check_precision(precision)?; @@ -388,7 +388,7 @@ impl Spec { position, } => { let (width, neg_width) = resolve_asterisk_width(*width, args).unwrap_or((0, false)); - let precision = resolve_asterisk_precision(*precision, args); + let precision = resolve_asterisk_precision(*precision, args)?; let i = args.next_u64(*position); if let Some(precision) = precision { check_precision(precision)?; @@ -417,7 +417,7 @@ impl Spec { position, } => { let (width, neg_width) = resolve_asterisk_width(*width, args).unwrap_or((0, false)); - let precision = resolve_asterisk_precision(*precision, args); + let precision = resolve_asterisk_precision(*precision, args)?; let f: ExtendedBigDecimal = args.next_extended_big_decimal(*position); if let Some(precision) = precision { check_precision(precision)?; @@ -462,14 +462,15 @@ fn resolve_asterisk_width( fn resolve_asterisk_precision( option: Option>, args: &mut FormatArguments, -) -> Option { +) -> Result, FormatError> { match option { - None => None, + None => Ok(None), Some(CanAsterisk::Asterisk(loc)) => match args.next_i64(loc) { - v if v >= 0 => usize::try_from(v).ok(), - _ => None, + v if v > i64::from(i32::MAX) => Err(FormatError::InvalidPrecision(v.to_string())), + v if v >= 0 => Ok(usize::try_from(v).ok()), + _ => Ok(None), }, - Some(CanAsterisk::Fixed(w)) => Some(w), + Some(CanAsterisk::Fixed(w)) => Ok(Some(w)), } } fn write_padded( diff --git a/crates/bashkit/src/builtins/generated/ls_args.rs b/crates/bashkit/src/builtins/generated/ls_args.rs index 995d6b0ee..5072cf453 100644 --- a/crates/bashkit/src/builtins/generated/ls_args.rs +++ b/crates/bashkit/src/builtins/generated/ls_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/ls/ +// Source: uutils/coreutils@9cc868bca src/uu/ls/ // Regenerate: cargo run -p bashkit-coreutils-port -- ls // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/mktemp_args.rs b/crates/bashkit/src/builtins/generated/mktemp_args.rs index e03f83ca3..7cdd63188 100644 --- a/crates/bashkit/src/builtins/generated/mktemp_args.rs +++ b/crates/bashkit/src/builtins/generated/mktemp_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/mktemp/ +// Source: uutils/coreutils@9cc868bca src/uu/mktemp/ // Regenerate: cargo run -p bashkit-coreutils-port -- mktemp // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/mod.rs b/crates/bashkit/src/builtins/generated/mod.rs index a018f79f8..96f39cfa1 100644 --- a/crates/bashkit/src/builtins/generated/mod.rs +++ b/crates/bashkit/src/builtins/generated/mod.rs @@ -26,7 +26,7 @@ // and at test time (the invariant assertion). Nothing in the lib's // runtime path needs it, hence `allow(dead_code)`. #[allow(dead_code)] -pub const UUTILS_REVISION: &str = "07763857f"; +pub const UUTILS_REVISION: &str = "9cc868bca"; pub mod cat_args; #[allow(clippy::collapsible_if, clippy::unwrap_used)] diff --git a/crates/bashkit/src/builtins/generated/num_parser.rs b/crates/bashkit/src/builtins/generated/num_parser.rs index 69dff4e11..f4d0e25d6 100644 --- a/crates/bashkit/src/builtins/generated/num_parser.rs +++ b/crates/bashkit/src/builtins/generated/num_parser.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uucore/src/lib/features/parser/num_parser.rs +// Source: uutils/coreutils@9cc868bca src/uucore/src/lib/features/parser/num_parser.rs // Regenerate: cargo run -p bashkit-coreutils-port -- port-module format // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/od_args.rs b/crates/bashkit/src/builtins/generated/od_args.rs index 59868519c..b728ecdcd 100644 --- a/crates/bashkit/src/builtins/generated/od_args.rs +++ b/crates/bashkit/src/builtins/generated/od_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/od/ +// Source: uutils/coreutils@9cc868bca src/uu/od/ // Regenerate: cargo run -p bashkit-coreutils-port -- od // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/readlink_args.rs b/crates/bashkit/src/builtins/generated/readlink_args.rs index 9bbe048f9..880c42302 100644 --- a/crates/bashkit/src/builtins/generated/readlink_args.rs +++ b/crates/bashkit/src/builtins/generated/readlink_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/readlink/ +// Source: uutils/coreutils@9cc868bca src/uu/readlink/ // Regenerate: cargo run -p bashkit-coreutils-port -- readlink // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/realpath_args.rs b/crates/bashkit/src/builtins/generated/realpath_args.rs index aa224c05a..7f1cd1b8c 100644 --- a/crates/bashkit/src/builtins/generated/realpath_args.rs +++ b/crates/bashkit/src/builtins/generated/realpath_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/realpath/ +// Source: uutils/coreutils@9cc868bca src/uu/realpath/ // Regenerate: cargo run -p bashkit-coreutils-port -- realpath // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/shuf_args.rs b/crates/bashkit/src/builtins/generated/shuf_args.rs index 521bbffb5..9aefdac7e 100644 --- a/crates/bashkit/src/builtins/generated/shuf_args.rs +++ b/crates/bashkit/src/builtins/generated/shuf_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/shuf/ +// Source: uutils/coreutils@9cc868bca src/uu/shuf/ // Regenerate: cargo run -p bashkit-coreutils-port -- shuf // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/stat_args.rs b/crates/bashkit/src/builtins/generated/stat_args.rs index e448000d4..ee904c5ae 100644 --- a/crates/bashkit/src/builtins/generated/stat_args.rs +++ b/crates/bashkit/src/builtins/generated/stat_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/stat/ +// Source: uutils/coreutils@9cc868bca src/uu/stat/ // Regenerate: cargo run -p bashkit-coreutils-port -- stat // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/tac_args.rs b/crates/bashkit/src/builtins/generated/tac_args.rs index cb45f3c81..f19e5c578 100644 --- a/crates/bashkit/src/builtins/generated/tac_args.rs +++ b/crates/bashkit/src/builtins/generated/tac_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/tac/ +// Source: uutils/coreutils@9cc868bca src/uu/tac/ // Regenerate: cargo run -p bashkit-coreutils-port -- tac // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. @@ -47,6 +47,7 @@ pub fn tac_command() -> Command { "Write each file to standard output, last line first.", )) .infer_long_args(true) + .args_override_self(true) .arg( Arg::new(options::BEFORE) .short('b') diff --git a/crates/bashkit/src/builtins/generated/tee_args.rs b/crates/bashkit/src/builtins/generated/tee_args.rs index 0d259e87c..268534666 100644 --- a/crates/bashkit/src/builtins/generated/tee_args.rs +++ b/crates/bashkit/src/builtins/generated/tee_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/tee/ +// Source: uutils/coreutils@9cc868bca src/uu/tee/ // Regenerate: cargo run -p bashkit-coreutils-port -- tee // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/truncate_args.rs b/crates/bashkit/src/builtins/generated/truncate_args.rs index ae701ade0..17301e7c6 100644 --- a/crates/bashkit/src/builtins/generated/truncate_args.rs +++ b/crates/bashkit/src/builtins/generated/truncate_args.rs @@ -1,6 +1,6 @@ // GENERATED by bashkit-coreutils-port. DO NOT EDIT. // -// Source: uutils/coreutils@07763857f src/uu/truncate/ +// Source: uutils/coreutils@9cc868bca src/uu/truncate/ // Regenerate: cargo run -p bashkit-coreutils-port -- truncate // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.