Skip to content

join: print unsorted line in error message #2899

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
merged 1 commit into from
Jan 21, 2022
Merged

join: print unsorted line in error message #2899

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: 7 additions & 4 deletions src/uu/join/src/join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ impl Spec {

struct Line {
fields: Vec<Vec<u8>>,
string: Vec<u8>,
}

impl Line {
Expand All @@ -247,10 +248,10 @@ impl Line {
.map(Vec::from)
.collect(),
Sep::Char(sep) => string.split(|c| *c == sep).map(Vec::from).collect(),
Sep::Line => vec![string],
Sep::Line => vec![string.clone()],
};

Line { fields }
Line { fields, string }
}

/// Get field at index.
Expand Down Expand Up @@ -444,9 +445,11 @@ impl<'a> State<'a> {

if diff == Ordering::Greater {
eprintln!(
"{}:{}: is not sorted",
"{}: {}:{}: is not sorted: {}",
uucore::execution_phrase(),
self.file_name.maybe_quote(),
self.line_num
self.line_num,
String::from_utf8_lossy(&line.string)
);

// This is fatal if the check is enabled.
Expand Down
7 changes: 6 additions & 1 deletion tests/by-util/test_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,16 @@ fn missing_format_fields() {

#[test]
fn wrong_line_order() {
let ts = TestScenario::new(util_name!());
new_ucmd!()
.arg("fields_2.txt")
.arg("fields_4.txt")
.fails()
.stderr_is("fields_4.txt:5: is not sorted");
.stderr_is(&format!(
"{} {}: fields_4.txt:5: is not sorted: 11 g 5 gh",
ts.bin_path.to_string_lossy(),
ts.util_name
));
}

#[test]
Expand Down