Skip to content

sort:Align sort debug key annotations with GNU coreutils #9468

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
sylvestre merged 11 commits into from
Dec 24, 2025
Merged

sort:Align sort debug key annotations with GNU coreutils #9468

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bfd89d6
fix: ignore NUL bytes in sort debug output alignment calculations
mattsu2020 Nov 20, 2025
1954850
Merge branch 'uutils:main' into sort-debug-keys
mattsu2020 Nov 24, 2025
62c9299
feat: add locale-aware tests for sort debug key annotations
mattsu2020 Nov 24, 2025
55b7884
refactor(test): optimize string building in debug_key_annotation_outp…
mattsu2020 Nov 24, 2025
d7989cc
refactor(tests): improve formatting and readability in sort test helpers
mattsu2020 Nov 24, 2025
b0f6290
refactor(test): embed expected debug key annotation outputs as constants
mattsu2020 Nov 24, 2025
0eb8bee
Merge branch 'main' into sort-debug-keys
mattsu2020 Dec 1, 2025
663f4bf
Merge branch 'main' into sort-debug-keys
mattsu2020 Dec 2, 2025
dd59b59
feat(sort): extract count_non_null_bytes for debug alignment
mattsu2020 Dec 5, 2025
80a4d91
Merge branch 'main' into sort-debug-keys
mattsu2020 Dec 15, 2025
480eef5
Merge branch 'main' into sort-debug-keys
mattsu2020 Dec 24, 2025
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
9 changes: 7 additions & 2 deletions src/uu/sort/src/sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,14 +671,19 @@ impl<'a> Line<'a> {
_ => {}
}

// Don't let embedded NUL bytes influence column alignment in the
// debug underline output, since they are often filtered out (e.g.
// via `tr -d '\0'`) before inspection.
let select = &line[..selection.start];
write!(writer, "{}", " ".repeat(select.len()))?;
let indent = select.iter().filter(|&&c| c != b'\0').count();
Copy link
Contributor

@sylvestre sylvestre Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please create a function for the filter
something like

fn count_non_null_bytes(bytes: &[u8]) -> usize {
    bytes.iter().filter(|&&c| c != b'\0').count()
}

Copy link
Contributor Author

@mattsu2020 mattsu2020 Dec 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix

write!(writer, "{}", " ".repeat(indent))?;

if selection.is_empty() {
writeln!(writer, "{}", translate!("sort-error-no-match-for-key"))?;
} else {
let select = &line[selection];
writeln!(writer, "{}", "_".repeat(select.len()))?;
let underline_len = select.iter().filter(|&&c| c != b'\0').count();
writeln!(writer, "{}", "_".repeat(underline_len))?;
}
}

Expand Down
Loading
Loading