mirror of
https://github.com/uutils/coreutils.git
synced 2026-06-10 15:48:22 -07:00
tr: simplify truncate logic
This commit is contained in:
committed by
Daniel Hofstetter
parent
53dfa2e874
commit
a60228a72c
@@ -304,19 +304,17 @@ impl Sequence {
|
||||
return Err(BadSequence::ComplementMoreThanOneUniqueInSet2);
|
||||
}
|
||||
|
||||
if set2_solved.len() < set1_solved.len()
|
||||
&& !truncate_set1_flag
|
||||
&& matches!(
|
||||
if set2_solved.len() < set1_solved.len() {
|
||||
if truncate_set1_flag {
|
||||
set1_solved.truncate(set2_solved.len());
|
||||
} else if matches!(
|
||||
set2.last().copied(),
|
||||
Some(Self::Class(Class::Upper | Class::Lower))
|
||||
)
|
||||
{
|
||||
return Err(BadSequence::Set1LongerSet2EndsInClass);
|
||||
}
|
||||
//Truncation is done dead last. It has no influence on the other conversion steps
|
||||
if truncate_set1_flag {
|
||||
set1_solved.truncate(set2_solved.len());
|
||||
) {
|
||||
return Err(BadSequence::Set1LongerSet2EndsInClass);
|
||||
}
|
||||
}
|
||||
|
||||
Ok((set1_solved, set2_solved))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user