Skip to content

chore: sync uutils/coreutils argument surfaces and vendored modules #2805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaliy merged 1 commit into from
Nov 2, 2026
Merged

chore: sync uutils/coreutils argument surfaces and vendored modules #2805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/cat_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> cat <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/extendedbigdecimal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <UUTILS_DIR> format <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/format/argument.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <UUTILS_DIR> format <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/format/escape.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <UUTILS_DIR> format <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/format/human.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <UUTILS_DIR> format <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/format/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <UUTILS_DIR> format <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/format/num_format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <UUTILS_DIR> format <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
21 changes: 11 additions & 10 deletions crates/bashkit/src/builtins/generated/format/spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <UUTILS_DIR> format <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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)?;
Expand All @@ -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)?;
Expand Down Expand Up @@ -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)?;
Expand Down Expand Up @@ -462,14 +462,15 @@ fn resolve_asterisk_width(
fn resolve_asterisk_precision(
option: Option<CanAsterisk<usize>>,
args: &mut FormatArguments,
) -> Option<usize> {
) -> Result<Option<usize>, 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(
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/ls_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> ls <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/mktemp_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> mktemp <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/num_parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <UUTILS_DIR> format <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/od_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> od <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/readlink_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> readlink <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/realpath_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> realpath <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/shuf_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> shuf <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/stat_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> stat <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
3 changes: 2 additions & 1 deletion crates/bashkit/src/builtins/generated/tac_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> tac <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/tee_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> tee <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
2 changes: 1 addition & 1 deletion crates/bashkit/src/builtins/generated/truncate_args.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 -- <UUTILS_DIR> truncate <REV>
//
// Original uutils licensed MIT; see THIRD_PARTY_LICENSES.
Expand Down
Loading