Fold: Adding combining character support#9328
Merged
cakebaker merged 4 commits intouutils:mainfrom Nov 20, 2025
Merged
Conversation
CodSpeed Performance ReportMerging #9328 will degrade performances by 2.81%Comparing Summary
Benchmarks breakdown
Footnotes
|
|
GNU testsuite comparison: |
|
GNU testsuite comparison: |
cakebaker
reviewed
Nov 19, 2025
src/uu/fold/src/fold.rs
Outdated
Comment on lines
437
to
447
| let mut next_idx = iter.peek().map(|(idx, _)| *idx).unwrap_or(line_bytes.len()); | ||
|
|
||
| // Include combining characters with the base character | ||
| while let Some(&(_, next_ch)) = iter.peek() { | ||
| if unicode_width::UnicodeWidthChar::width(next_ch).unwrap_or(1) == 0 { | ||
| iter.next(); | ||
| next_idx = iter.peek().map(|(idx, _)| *idx).unwrap_or(line_bytes.len()); | ||
| } else { | ||
| break; | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
I think you can set next_idx after the loop as you don't use it in the loop.
Suggested change
| let mut next_idx = iter.peek().map(|(idx, _)| *idx).unwrap_or(line_bytes.len()); | |
| // Include combining characters with the base character | |
| while let Some(&(_, next_ch)) = iter.peek() { | |
| if unicode_width::UnicodeWidthChar::width(next_ch).unwrap_or(1) == 0 { | |
| iter.next(); | |
| next_idx = iter.peek().map(|(idx, _)| *idx).unwrap_or(line_bytes.len()); | |
| } else { | |
| break; | |
| } | |
| } | |
| // Include combining characters with the base character | |
| while let Some(&(_, next_ch)) = iter.peek() { | |
| if unicode_width::UnicodeWidthChar::width(next_ch).unwrap_or(1) == 0 { | |
| iter.next(); | |
| } else { | |
| break; | |
| } | |
| } | |
| let next_idx = iter.peek().map(|(idx, _)| *idx).unwrap_or(line_bytes.len()); |
Collaborator
Author
There was a problem hiding this comment.
Much cleaner, thanks!
cakebaker
reviewed
Nov 19, 2025
Contributor
cakebaker
left a comment
There was a problem hiding this comment.
I don't know if you have seen it: the CI shows some trivial clippy issues.
|
GNU testsuite comparison: |
Contributor
Kudos, and thanks for your PR! |
naoNao89
pushed a commit
to naoNao89/coreutils
that referenced
this pull request
Nov 24, 2025
* Adding combining character support for fold * add fullwidth to the spell ignore list * addressing comments and cargo fmt fixes * clippy fixes for test files --------- Co-authored-by: Christopher Illarionova <drydench@amazon.com> Co-authored-by: Sylvestre Ledru <sylvestre@debian.org>
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
3 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.
Been looking at how I can contribute to getting some of the tests to pass, working on this bin and it seems like adding this is a simple fix for the main fold test. The handling zero tests seem like they require a relatively major rework