Skip to content

cut: don't merge adjacent ranges #6990

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
Dec 22, 2024
Merged

cut: don't merge adjacent ranges #6990

Show file tree
Hide file tree
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
11 changes: 4 additions & 7 deletions src/uucore/src/lib/features/ranges.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ impl Range {
Ok(Self::merge(ranges))
}

/// Merge any overlapping ranges
/// Merge any overlapping ranges. Adjacent ranges are *NOT* merged.
///
/// Is guaranteed to return only disjoint ranges in a sorted order.
fn merge(mut ranges: Vec<Self>) -> Vec<Self> {
Expand All @@ -101,10 +101,7 @@ impl Range {
for i in 0..ranges.len() {
let j = i + 1;

// The +1 is a small optimization, because we can merge adjacent Ranges.
// For example (1,3) and (4,6), because in the integers, there are no
// possible values between 3 and 4, this is equivalent to (1,6).
while j < ranges.len() && ranges[j].low <= ranges[i].high + 1 {
while j < ranges.len() && ranges[j].low <= ranges[i].high {
let j_high = ranges.remove(j).high;
ranges[i].high = max(ranges[i].high, j_high);
}
Expand Down Expand Up @@ -216,8 +213,8 @@ mod test {
&[r(10, 40), r(50, 60)],
);

// Merge adjacent ranges
m(vec![r(1, 3), r(4, 6)], &[r(1, 6)]);
// Don't merge adjacent ranges
m(vec![r(1, 3), r(4, 6)], &[r(1, 3), r(4, 6)]);
}

#[test]
Expand Down
2 changes: 0 additions & 2 deletions tests/by-util/test_cut.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,6 @@ fn test_newline_preservation_with_f1_option() {
ucmd.args(&["-f1-", "1"]).succeeds().stdout_is(expected);
}

#[ignore = "Not yet implemented"]
#[test]
fn test_output_delimiter_with_character_ranges() {
new_ucmd!()
Expand All @@ -360,7 +359,6 @@ fn test_output_delimiter_with_character_ranges() {
.stdout_only("bc:defg\n");
}

#[ignore = "Not yet implemented"]
#[test]
fn test_output_delimiter_with_adjacent_ranges() {
new_ucmd!()
Expand Down
Loading