sort: add locale-aware month sorting (-M)#11445
Open
sylvestre wants to merge 2 commits intouutils:mainfrom
Open
sort: add locale-aware month sorting (-M)#11445sylvestre wants to merge 2 commits intouutils:mainfrom
sylvestre wants to merge 2 commits intouutils:mainfrom
Conversation
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
sylvestre
force-pushed
the
sort-month
branch
2 times, most recently
from
3377348 to
aa3ca32
Compare
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
sylvestre
force-pushed
the
sort-month
branch
2 times, most recently
from
146a915 to
afbe750
Compare
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
cakebaker
reviewed
Mar 24, 2026
| } | ||
| let text = String::from_utf8(output.stdout).ok()?; | ||
| let months: Vec<String> = text.trim().split(';').map(String::from).collect(); | ||
| if months.len() == 12 && months.iter().all(|m| !m.is_empty()) { |
Contributor
There was a problem hiding this comment.
I would do the check for emptiness with a filter as part of the chain on the previous line.
cakebaker
reviewed
Mar 24, 2026
Comment on lines
+640
to
+643
| let expected = months.iter().fold(String::new(), |mut s, m| { | ||
| writeln!(s, "{m}").unwrap(); | ||
| s | ||
| }); |
Contributor
There was a problem hiding this comment.
Using join might be easier to read:
Suggested change
| let expected = months.iter().fold(String::new(), |mut s, m| { | |
| writeln!(s, "{m}").unwrap(); | |
| s | |
| }); | |
| let expected = months.join("\n") + "\n"; |
cakebaker
reviewed
Mar 24, 2026
Contributor
There was a problem hiding this comment.
Just wondering: are those tests ever run in the CI?
cakebaker
reviewed
Mar 24, 2026
| let initial_selection = &self.line[selection.clone()]; | ||
|
|
||
| let mut month_chars = initial_selection | ||
| let trimmed = initial_selection |
Contributor
There was a problem hiding this comment.
The name trimmed is a bit misleading as it contains a position (and not a trimmed string).
cakebaker
reviewed
Mar 24, 2026
Comment on lines
+803
to
+806
| trimmed..trimmed | ||
| } else { | ||
| // We parsed a month. Match the first three non-whitespace characters, which must be the month we parsed. | ||
| month_chars.next().unwrap().0 | ||
| ..month_chars | ||
| .nth(2) | ||
| .map_or(initial_selection.len(), |(idx, _)| idx) | ||
| // We parsed a month. Use the actual match byte length. | ||
| trimmed..(trimmed + match_len) |
Contributor
There was a problem hiding this comment.
It might make sense to set selection.start and selection.end directly in the if/else blocks instead of returning a range.
cakebaker
reviewed
Mar 24, 2026
| /// Parse the beginning string into a Month, returning [`Month::Unknown`] on errors. | ||
| fn month_parse(line: &[u8]) -> Month { | ||
| /// Also returns the byte length consumed from the input (after leading blanks). | ||
| fn month_parse(line: &[u8]) -> (Month, usize) { |
Contributor
There was a problem hiding this comment.
I think this function is not entirely correct.
Here is an example where I get a different output compared to GNU sort:
$ printf "juin\nav ril\nmars\nfevr." | LC_ALL=fr_FR.UTF-8 cargo run -q sort -M
fevr.
mars
av ril
juin
$ printf "juin\nav ril\nmars\nfevr." | LC_ALL=fr_FR.UTF-8 sort -M
av ril
fevr.
mars
juin
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.
No description provided.