From 88f5a0ae7298e643dd97c160d8890fca3931b61d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Oct 2026 10:25:44 +0000 Subject: [PATCH] chore(builtins): sync uutils/coreutils argument surfaces and vendored modules Regenerated by `bashkit-coreutils-port` against uutils/coreutils@afe06319a. Utilities: cat ls mktemp od readlink realpath shuf stat tac tee truncate Vendored modules: format --- .../bashkit/src/builtins/generated/cat_args.rs | 2 +- .../src/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 +- .../bashkit/src/builtins/generated/format/mod.rs | 2 +- .../src/builtins/generated/format/num_format.rs | 2 +- .../src/builtins/generated/format/spec.rs | 2 +- crates/bashkit/src/builtins/generated/ls_args.rs | 2 +- .../src/builtins/generated/mktemp_args.rs | 2 +- crates/bashkit/src/builtins/generated/mod.rs | 2 +- .../bashkit/src/builtins/generated/num_parser.rs | 16 +++++++++++++--- crates/bashkit/src/builtins/generated/od_args.rs | 2 +- .../src/builtins/generated/readlink_args.rs | 2 +- .../src/builtins/generated/realpath_args.rs | 2 +- .../bashkit/src/builtins/generated/shuf_args.rs | 16 +--------------- .../bashkit/src/builtins/generated/stat_args.rs | 2 +- .../bashkit/src/builtins/generated/tac_args.rs | 2 +- .../bashkit/src/builtins/generated/tee_args.rs | 2 +- .../src/builtins/generated/truncate_args.rs | 2 +- 20 files changed, 32 insertions(+), 36 deletions(-) diff --git a/crates/bashkit/src/builtins/generated/cat_args.rs b/crates/bashkit/src/builtins/generated/cat_args.rs index e422ebc41..e8e9870f5 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@d2d96946b src/uu/cat/ +// Source: uutils/coreutils@afe06319a 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 7dbd345db..fd8a3a7d3 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@d2d96946b src/uucore/src/lib/features/extendedbigdecimal.rs +// Source: uutils/coreutils@afe06319a 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 9944c03ac..c5096d781 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@d2d96946b src/uucore/src/lib/features/format/argument.rs +// Source: uutils/coreutils@afe06319a 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 7a98c0ca7..da69deaca 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@d2d96946b src/uucore/src/lib/features/format/escape.rs +// Source: uutils/coreutils@afe06319a 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 2bb436ced..9f3d32350 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@d2d96946b src/uucore/src/lib/features/format/human.rs +// Source: uutils/coreutils@afe06319a 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 8816e8b22..63c22f2c5 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@d2d96946b src/uucore/src/lib/features/format/mod.rs +// Source: uutils/coreutils@afe06319a 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 90b6c5d77..7265f6d19 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@d2d96946b src/uucore/src/lib/features/format/num_format.rs +// Source: uutils/coreutils@afe06319a 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 4b3d3a55b..1f2dc4f16 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@d2d96946b src/uucore/src/lib/features/format/spec.rs +// Source: uutils/coreutils@afe06319a 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. diff --git a/crates/bashkit/src/builtins/generated/ls_args.rs b/crates/bashkit/src/builtins/generated/ls_args.rs index ecb70d42e..c13f01a38 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@d2d96946b src/uu/ls/ +// Source: uutils/coreutils@afe06319a 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 86300d875..eeb7e9711 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@d2d96946b src/uu/mktemp/ +// Source: uutils/coreutils@afe06319a 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 57a25751c..7b500b848 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 = "d2d96946b"; +pub const UUTILS_REVISION: &str = "afe06319a"; 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 cb5e644ca..1b305b915 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@d2d96946b src/uucore/src/lib/features/parser/num_parser.rs +// Source: uutils/coreutils@afe06319a 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. @@ -14,6 +14,7 @@ use bigdecimal::num_bigint::Sign; use num_traits::Signed; use num_traits::ToPrimitive; use num_traits::Zero; +const SUBNANOSECOND_BINARY_EXPONENT: i32 = -30; #[derive(Clone, Copy, PartialEq)] enum Base { /// Binary base @@ -423,8 +424,17 @@ pub(crate) fn parse( } let (mul, rest) = parse_suffix_multiplier(rest, allowed_suffixes); let digits = digits.unwrap() * mul; - let ebd_result = - construct_extended_big_decimal(digits, negative, base, scale, exponent.unwrap_or_default()); + let exponent = exponent.unwrap_or_default(); + let ebd_result = if target == ParseTarget::Duration + && base == Base::Hexadecimal + && !digits.is_zero() + && BigInt::from(digits.bits()) + &exponent - BigInt::from(scale) * 4 + <= BigInt::from(SUBNANOSECOND_BINARY_EXPONENT) + { + Err(make_error(false, negative)) + } else { + construct_extended_big_decimal(digits, negative, base, scale, exponent) + }; if rest.is_empty() { ebd_result } else { diff --git a/crates/bashkit/src/builtins/generated/od_args.rs b/crates/bashkit/src/builtins/generated/od_args.rs index f7a894ded..3766166ca 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@d2d96946b src/uu/od/ +// Source: uutils/coreutils@afe06319a 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 47868cf4c..cda81c996 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@d2d96946b src/uu/readlink/ +// Source: uutils/coreutils@afe06319a 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 345a4d6e0..0ec90c162 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@d2d96946b src/uu/realpath/ +// Source: uutils/coreutils@afe06319a 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 22f2917da..a34cc8f5a 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@d2d96946b src/uu/shuf/ +// Source: uutils/coreutils@afe06319a src/uu/shuf/ // Regenerate: cargo run -p bashkit-coreutils-port -- shuf // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. @@ -42,19 +42,6 @@ fn format_usage(s: &str) -> String { /// virtual `ctx.env` — never `std::env` — drives clap's env-default /// path. Order matches the chain order in the original `uu_app()`. pub static SHUF_ENV_DEFAULTS: &[crate::builtins::clap_env::EnvDefault] = &[]; -fn parse_range(input_range: &str) -> Result, String> { - if let Some((from, to)) = input_range.split_once('-') { - let begin = from.parse::().map_err(|e| e.to_string())?; - let end = to.parse::().map_err(|e| e.to_string())?; - if begin <= end || begin == end + 1 { - Ok(begin..=end) - } else { - Err(::std::string::String::from("start exceeds end")) - } - } else { - Err(::std::string::String::from("missing '-'")) - } -} pub fn shuf_command() -> Command { Command::new("shuf") .about( @@ -90,7 +77,6 @@ pub fn shuf_command() -> Command { "treat each number LO through HI as an input line", ), ) - .value_parser(parse_range) .conflicts_with(options::FILE_OR_ARGS), ) .arg( diff --git a/crates/bashkit/src/builtins/generated/stat_args.rs b/crates/bashkit/src/builtins/generated/stat_args.rs index 9d6fcb650..30d587888 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@d2d96946b src/uu/stat/ +// Source: uutils/coreutils@afe06319a 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 2f963e17a..1d75d0156 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@d2d96946b src/uu/tac/ +// Source: uutils/coreutils@afe06319a src/uu/tac/ // Regenerate: cargo run -p bashkit-coreutils-port -- tac // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES. diff --git a/crates/bashkit/src/builtins/generated/tee_args.rs b/crates/bashkit/src/builtins/generated/tee_args.rs index 33fc20b55..f78558e12 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@d2d96946b src/uu/tee/ +// Source: uutils/coreutils@afe06319a 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 114d05417..4e8ec9b77 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@d2d96946b src/uu/truncate/ +// Source: uutils/coreutils@afe06319a src/uu/truncate/ // Regenerate: cargo run -p bashkit-coreutils-port -- truncate // // Original uutils licensed MIT; see THIRD_PARTY_LICENSES.