tsort: gnu misc tsort.pl by mattsu2020 · Pull Request #9289 · uutils/coreutils

mattsu2020 · 2025-11-15T12:47:12Z

Summary

Align tsort with GNU behavior: silently accept -w, reorder successors to produce GNU’s deterministic output, and surface loop errors with the new util: error: … prefix via clap_localization::print_prefixed_error.
Adjust uniq, comm, tsort, and chroot tests to expect the prefixed error strings so they continue to pass with the updated localization handling.
Keep the test fixtures and assertions consistent with the updated message format across the suite.

Tests

cargo test test_tsort
cargo test test_uniq (including gnu_tests)
cargo test test_chroot --features chroot

…raph topologies - Introduce new test cases for cycle loops in file inputs, including extra nodes and multiple loops - Add tests for POSIX graph examples and linear tree graphs to validate topological sorting - Include tests for error handling on odd token counts and multiple file inputs - Ensures robustness and correctness of tsort implementation across various edge cases and standard scenarios

…ne literals in tsort test file - Reformatted TSORT_LOOP_STDERR_AC and TSORT_UNEXPECTED_ARG_ERROR constants for improved code readability and consistency, with no change in string content or functionality. The multi-line format was merged into single lines to align with potential linting rules or style preferences for string literals in tests. This refactoring enhances maintainability without affecting test logic.

- Added `ArgAction` import and a new hidden `-w`/`--warn` argument to the tsort command for future warning features - Modified iteration of successor names to use `.into_iter().rev()` in the topological sorting algorithm to process nodes in reverse order, ensuring more stable and predictable output sequence - Refactored Clap error localization in `clap_localization.rs` to use `print_prefixed_error()` method instead of direct `eprintln!` calls, improving consistency in error message formatting across the application

Update expected error outputs in uniq tests to match the new format where error messages are prefixed with "uniq: ". This ensures test cases align with the updated error message formatting in the utility, providing clearer error identification by including the program name at the start of each error message. Changes affect multiple test assertions for invalid options and incompatible argument combinations.

The expected error message now starts with "chroot: " to match the updated output format in the chroot utility. This ensures the test accurately reflects the command's behavior.

src/uucore/src/lib/mods/clap_localization.rs

tests/by-util/test_chroot.rs

…d format Remove "chroot: " prefix from expected error output, aligning the test with the updated stderr format that omits utility name redundancy in error messages.

Remove the 'uniq: ' prefix from expected error messages in test cases to match the updated output format of the uniq utility, ensuring tests pass with the current implementation. This change affects multiple GNU compatibility tests for invalid options and argument conflicts.

…t 'comm: ' prefix The stderr assertion in test_comm_arg_error was expecting an error message prefixed with "comm: ", but the actual command output does not include this prefix. This update fixes the test to align with the real behavior, ensuring the test passes correctly.

… stderr output in ErrorFormatter Replace the call to self.print_prefixed_error with direct eprintln for printing unexpected argument errors, and add an additional blank line for better formatting and readability in error messages. This change aims to simplify the output process and ensure consistent error presentation in the clap localization module.

…irect eprintln for cleaner output Modified error handling in clap_localization.rs to eliminate the utility name prefix by replacing self.print_prefixed_error calls with direct eprintln! invocations. This simplifies the codebase and changes error message formatting to display clap errors without the preceding util name. Removed the unused print_prefixed_error method.

…age is corrected - Added #[ignore] attribute to test_only_one_input_file to skip it during execution. - Reason: Test likely fails due to an incorrect error message; this prevents false negatives while the message is being fixed in the tsort utility.

github-actions · 2025-11-15T14:28:56Z

GNU testsuite comparison:

Skipping an intermittent issue tests/tail/overlay-headers (passes in this run but fails in the 'main' branch)

codspeed-hq · 2025-11-16T02:28:48Z

CodSpeed Performance Report

Merging #9289 will not alter performance

_{Comparing mattsu2020:tsort_compatibility (7cb4474) with main (370ea74)}

Summary

✅ 127 untouched
⏩ 6 skipped¹

6 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩

github-actions · 2025-11-16T02:34:07Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Skipping an intermittent issue tests/tail/overlay-headers (passes in this run but fails in the 'main' branch)

sylvestre · 2025-12-01T12:13:41Z

is it expected that tsort.pl doesn't pass yet? thanks

- Change FILE arg to accept zero or more inputs (appended), defaulting to "-" if none - Add validation to error on more than one input with "extra operand" message - Update test to expect new error format, matching GNU tsort behavior - Unignore test_only_one_input_file after error message correction

Split the TSORT_EXTRA_OPERAND_ERROR constant string into multiple lines to improve code formatting and adhere to line length guidelines.

Removed the tests_tsort.patch entry as it is no longer applied, possibly due to upstream integration or obsolescence, to keep the patch series current and relevant.

github-actions · 2025-12-01T13:51:03Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Congrats! The gnu test tests/misc/tsort is no longer failing!

…rapper Remove unnecessary `.into()` call when creating the extra operand error in uumain, resulting in cleaner, more concise error handling code. This change does not alter the program's functionality but improves code readability and reduces nesting.

github-actions · 2025-12-02T11:19:43Z

GNU testsuite comparison:

Congrats! The gnu test tests/misc/tsort is no longer failing!

sylvestre · 2025-12-02T13:20:45Z

src/uu/tsort/src/tsort.rs

+        return Err(USimpleError::new(
+            1,
+            format!(
+                "extra operand {}\nTry 'tsort --help' for more information.",


please use the translate!() macro

sylvestre · 2025-12-02T13:20:49Z

src/uu/tsort/src/tsort.rs

+        ));
+    }
+
+    let input = inputs.into_iter().next().expect("at least one input");


Add localized strings for 'extra operand' and 'at least one input' errors in en-US and fr-FR locales. Update code to use translate! macro for consistent error reporting across languages, improving user experience for international users.

The translate! macro returns a String, but expect() requires a &str. Added .as_str() to convert the translated string for correct type usage and fix compilation error.

github-actions · 2025-12-03T09:16:35Z

GNU testsuite comparison:

Congrats! The gnu test tests/misc/tsort is no longer failing!

github-actions · 2025-12-23T13:23:32Z

GNU testsuite comparison:

Congrats! The gnu test tests/misc/tsort is no longer failing!

* test: add comprehensive test coverage for tsort cycle detection and graph topologies - Introduce new test cases for cycle loops in file inputs, including extra nodes and multiple loops - Add tests for POSIX graph examples and linear tree graphs to validate topological sorting - Include tests for error handling on odd token counts and multiple file inputs - Ensures robustness and correctness of tsort implementation across various edge cases and standard scenarios * refactor(tests): consolidate multi-line string constants to single-line literals in tsort test file - Reformatted TSORT_LOOP_STDERR_AC and TSORT_UNEXPECTED_ARG_ERROR constants for improved code readability and consistency, with no change in string content or functionality. The multi-line format was merged into single lines to align with potential linting rules or style preferences for string literals in tests. This refactoring enhances maintainability without affecting test logic. * feat(tsort): add hidden warn flag and reverse successor iteration order - Added `ArgAction` import and a new hidden `-w`/`--warn` argument to the tsort command for future warning features - Modified iteration of successor names to use `.into_iter().rev()` in the topological sorting algorithm to process nodes in reverse order, ensuring more stable and predictable output sequence - Refactored Clap error localization in `clap_localization.rs` to use `print_prefixed_error()` method instead of direct `eprintln!` calls, improving consistency in error message formatting across the application * fix(test): prefix uniq error messages with program name Update expected error outputs in uniq tests to match the new format where error messages are prefixed with "uniq: ". This ensures test cases align with the updated error message formatting in the utility, providing clearer error identification by including the program name at the start of each error message. Changes affect multiple test assertions for invalid options and incompatible argument combinations. * fix(test): update chroot error assertion to include command prefix The expected error message now starts with "chroot: " to match the updated output format in the chroot utility. This ensures the test accurately reflects the command's behavior. * fix(test/chroot): update error message assertion to match standardized format Remove "chroot: " prefix from expected error output, aligning the test with the updated stderr format that omits utility name redundancy in error messages. * fix: update uniq error messages in tests, removing 'uniq: ' prefix Remove the 'uniq: ' prefix from expected error messages in test cases to match the updated output format of the uniq utility, ensuring tests pass with the current implementation. This change affects multiple GNU compatibility tests for invalid options and argument conflicts. * fix(comm): update test assertion to match actual error message without 'comm: ' prefix The stderr assertion in test_comm_arg_error was expecting an error message prefixed with "comm: ", but the actual command output does not include this prefix. This update fixes the test to align with the real behavior, ensuring the test passes correctly. * refactor(clap_localization): replace print_prefixed_error with direct stderr output in ErrorFormatter Replace the call to self.print_prefixed_error with direct eprintln for printing unexpected argument errors, and add an additional blank line for better formatting and readability in error messages. This change aims to simplify the output process and ensure consistent error presentation in the clap localization module. * refactor(clap_localization): remove prefixed error printing and use direct eprintln for cleaner output Modified error handling in clap_localization.rs to eliminate the utility name prefix by replacing self.print_prefixed_error calls with direct eprintln! invocations. This simplifies the codebase and changes error message formatting to display clap errors without the preceding util name. Removed the unused print_prefixed_error method. * test(tests/tsort): ignore test for single input file until error message is corrected - Added #[ignore] attribute to test_only_one_input_file to skip it during execution. - Reason: Test likely fails due to an incorrect error message; this prevents false negatives while the message is being fixed in the tsort utility. * feat(tsort): reject multiple input arguments with custom error - Change FILE arg to accept zero or more inputs (appended), defaulting to "-" if none - Add validation to error on more than one input with "extra operand" message - Update test to expect new error format, matching GNU tsort behavior - Unignore test_only_one_input_file after error message correction * refactor: format TSORT_EXTRA_OPERAND_ERROR constant for readability Split the TSORT_EXTRA_OPERAND_ERROR constant string into multiple lines to improve code formatting and adhere to line length guidelines. * chore: remove tests_tsort.patch from gnu-patches series Removed the tests_tsort.patch entry as it is no longer applied, possibly due to upstream integration or obsolescence, to keep the patch series current and relevant. * fix(tsort): simplify error message construction by removing .into() wrapper Remove unnecessary `.into()` call when creating the extra operand error in uumain, resulting in cleaner, more concise error handling code. This change does not alter the program's functionality but improves code readability and reduces nesting. * feat: internationalize error messages in tsort command Add localized strings for 'extra operand' and 'at least one input' errors in en-US and fr-FR locales. Update code to use translate! macro for consistent error reporting across languages, improving user experience for international users. * fix(tsort): ensure expect message is &str by calling .as_str() The translate! macro returns a String, but expect() requires a &str. Added .as_str() to convert the translated string for correct type usage and fix compilation error.

mattsu2020 added 5 commits November 15, 2025 19:34

fix(test): update chroot error assertion to include command prefix

70c7ed4

The expected error message now starts with "chroot: " to match the updated output format in the chroot utility. This ensures the test accurately reflects the command's behavior.

sylvestre reviewed Nov 15, 2025

View reviewed changes

src/uucore/src/lib/mods/clap_localization.rs Outdated Show resolved Hide resolved

sylvestre reviewed Nov 15, 2025

View reviewed changes

tests/by-util/test_chroot.rs Outdated Show resolved Hide resolved

mattsu2020 added 4 commits November 15, 2025 22:04

fix(test/chroot): update error message assertion to match standardize…

a3667f2

…d format Remove "chroot: " prefix from expected error output, aligning the test with the updated stderr format that omits utility name redundancy in error messages.

mattsu2020 changed the title ~~tsort: gnu misc /tsort.pl~~ tsort: gnu misc tsort.pl Nov 15, 2025

mattsu2020 added 2 commits November 15, 2025 22:54

Merge branch 'uutils:main' into tsort_compatibility

57ab06a

Merge branch 'main' into tsort_compatibility

37cc210

mattsu2020 added 3 commits December 1, 2025 21:18

refactor: format TSORT_EXTRA_OPERAND_ERROR constant for readability

4275d60

Split the TSORT_EXTRA_OPERAND_ERROR constant string into multiple lines to improve code formatting and adhere to line length guidelines.

chore: remove tests_tsort.patch from gnu-patches series

6b420d8

Removed the tests_tsort.patch entry as it is no longer applied, possibly due to upstream integration or obsolescence, to keep the patch series current and relevant.

sylvestre reviewed Dec 2, 2025

View reviewed changes

mattsu2020 added 2 commits December 3, 2025 17:53

fix(tsort): ensure expect message is &str by calling .as_str()

7d21d9c

The translate! macro returns a String, but expect() requires a &str. Added .as_str() to convert the translated string for correct type usage and fix compilation error.

Merge branch 'main' into tsort_compatibility

7cb4474

sylvestre merged commit 0f8eb45 into uutils:main Dec 23, 2025
125 of 126 checks passed

mattsu2020 deleted the tsort_compatibility branch December 23, 2025 23:12

ChrisDryden mentioned this pull request Dec 24, 2025

GNU coreutils 9.9: Detailed Test report 12/19 #9729

Closed

moonfruit mentioned this pull request Feb 3, 2026

uutils-selected 0.6.0 moonfruit/homebrew-tap#453

Closed

Uh oh!

Conversation

mattsu2020 commented Nov 15, 2025

Summary

Tests

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Nov 15, 2025

Uh oh!

codspeed-hq bot commented Nov 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CodSpeed Performance Report

Merging #9289 will not alter performance

Summary

Footnotes

Uh oh!

github-actions bot commented Nov 16, 2025

Uh oh!

sylvestre commented Dec 1, 2025

Uh oh!

github-actions bot commented Dec 1, 2025

Uh oh!

github-actions bot commented Dec 2, 2025

Uh oh!

sylvestre Dec 2, 2025

Choose a reason for hiding this comment

Uh oh!

mattsu2020 Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

sylvestre Dec 2, 2025

Choose a reason for hiding this comment

Uh oh!

mattsu2020 Dec 3, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Dec 3, 2025

Uh oh!

github-actions bot commented Dec 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codspeed-hq bot commented Nov 16, 2025 •

edited

Loading