uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

join: remove collapsible_if

Browse Source
This commit is contained in:
oech3
2026-04-19 11:43:31 +02:00
committed by Sylvestre Ledru
parent 01b7177f0b
commit f835fc484e
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/join/src/join.rs
+8 -14
View File
@@ -1109,21 +1109,15 @@ fn exec<Sep: Separator>(
/// Check that keys for both files and for a particular file are not
/// contradictory and return the key index.
fn get_field_number(keys: Option<usize>, key: Option<usize>) -> UResult<usize> {
if let Some(keys) = keys {
if let Some(key) = key {
if keys != key {
// Show zero-based field numbers as one-based.
return Err(USimpleError::new(
1,
translate!("join-error-incompatible-fields", "field1" => (keys + 1), "field2" => (key + 1)),
));
}
}
return Ok(keys);
match (keys, key) {
// Show zero-based field numbers as one-based.
(Some(k1), Some(k2)) if k1 != k2 => Err(USimpleError::new(
1,
translate!("join-error-incompatible-fields", "field1" => (k1 + 1), "field2" => (k2 + 1)),
)),
(Some(k), _) | (_, Some(k)) => Ok(k),
(None, None) => Ok(0),
}
Ok(key.unwrap_or(0))
}
/// Parse the specified field string as a natural number and return