Make shuf OsStr-compliant and bring newline handling in line with GNU#7463
Merged
sylvestre merged 3 commits intouutils:mainfrom Mar 22, 2025
Merged
Make shuf OsStr-compliant and bring newline handling in line with GNU#7463sylvestre merged 3 commits intouutils:mainfrom
shuf OsStr-compliant and bring newline handling in line with GNU#7463sylvestre merged 3 commits intouutils:mainfrom
Conversation
- shuf now uses OS strings, so it can read from filenames that are invalid Unicode and it can shuffle arguments that are invalid Unicode. `uucore` now has an `OsWrite` trait to support this without platform-specific boilerplate. - shuf no longer tries to split individual command line arguments, only bulk input from a file/stdin. (This matches GNU and busybox.) - More values are parsed inside clap instead of manually, leading to better error messages and less code. - Some code has been simplified or made more idiomatic.
This removes the need for some manually duplicated code and keeps shuf_exec() (which is generic) smaller, for less binary bloat and better build times.
|
GNU testsuite comparison: |
Contributor
|
as you are working on it, maybe implement #2528 ? :) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
shuf now uses OS strings, so it can read from filenames that are invalid Unicode and it can shuffle arguments that are invalid Unicode.
uucorenow has anOsWritetrait to support this without platform-specific boilerplate.shuf no longer tries to split individual command line arguments, only bulk input from a file/stdin. (This matches GNU and busybox.)
More values are parsed inside clap instead of manually, leading to better error messages and less code.
Some code has been simplified or made more idiomatic.
I plan to follow up with a PR to optimize shuf with vectored writes and mmap. (Last time I tried this I got sidetracked by a stdlib bug: rust-lang/rust#121938)