Skip to content

uniq: rename keys_differ to keys_are_equal #10070

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 1 commit into from
Jan 6, 2026
+14 −14
Merged

uniq: rename keys_differ to keys_are_equal #10070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions src/uu/uniq/src/uniq.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,15 @@ impl Uniq {

self.build_meta(&next_buf, &mut next_meta);

if self.keys_differ(&current_buf, &current_meta, &next_buf, &next_meta) {
if self.keys_are_equal(&current_buf, &current_meta, &next_buf, &next_meta) {
if self.all_repeated {
self.print_line(writer, &current_buf, group_count, first_line_printed)?;
first_line_printed = true;
std::mem::swap(&mut current_buf, &mut next_buf);
std::mem::swap(&mut current_meta, &mut next_meta);
}
group_count += 1;
} else {
if (group_count == 1 && !self.repeats_only)
|| (group_count > 1 && !self.uniques_only)
{
Expand All @@ -105,14 +113,6 @@ impl Uniq {
std::mem::swap(&mut current_buf, &mut next_buf);
std::mem::swap(&mut current_meta, &mut next_meta);
group_count = 1;
} else {
if self.all_repeated {
self.print_line(writer, &current_buf, group_count, first_line_printed)?;
first_line_printed = true;
std::mem::swap(&mut current_buf, &mut next_buf);
std::mem::swap(&mut current_meta, &mut next_meta);
}
group_count += 1;
}
next_buf.clear();
}
Expand All @@ -136,7 +136,7 @@ impl Uniq {
if self.zero_terminated { 0 } else { b'\n' }
}

fn keys_differ(
fn keys_are_equal(
&self,
first_line: &[u8],
first_meta: &LineMeta,
Expand All @@ -146,11 +146,11 @@ impl Uniq {
let first_slice = &first_line[first_meta.key_start..first_meta.key_end];
let second_slice = &second_line[second_meta.key_start..second_meta.key_end];

if !self.ignore_case {
return first_slice != second_slice;
if self.ignore_case {
first_slice.eq_ignore_ascii_case(second_slice)
} else {
first_slice == second_slice
}

!first_slice.eq_ignore_ascii_case(second_slice)
}

fn key_bounds(&self, line: &[u8]) -> (usize, usize) {
Expand Down
Loading