RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00
Code Issues Activity

Merge pull request #7403 from cakebaker/cksum_use_is_none_or

Browse source 
cksum: replace `is_some_and` with `is_none_or`
This commit is contained in:
Sylvestre Ledru 2025-03-05 09:33:34 +01:00 • committed by GitHub
commit 0f9b36b0d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/uucore/src/lib/features/checksum.rs
View file

@ -583,10 +583,7 @@ fn get_expected_digest_as_hex_string(
) -> Option<Cow<str>> {
let ck = &line_info.checksum;
// TODO MSRV 1.82, replace `is_some_and` with `is_none_or`
// to improve readability. This closure returns True if a length hint provided
// and the argument isn't the same as the hint.
let against_hint = |len| len_hint.is_some_and(|l| l != len);
let against_hint = |len| len_hint.is_none_or(|l| l == len);
if ck.len() % 2 != 0 {
// If the length of the digest is not a multiple of 2, then it
@ -594,9 +591,9 @@ fn get_expected_digest_as_hex_string(
return None;
}
// If the digest can be decoded as hexadecimal AND it length match the
// If the digest can be decoded as hexadecimal AND its length matches the
// one expected (in case it's given), just go with it.
if ck.as_bytes().iter().all(u8::is_ascii_hexdigit) && !against_hint(ck.len()) {
if ck.as_bytes().iter().all(u8::is_ascii_hexdigit) && against_hint(ck.len()) {
return Some(Cow::Borrowed(ck));
}
@ -608,7 +605,7 @@ fn get_expected_digest_as_hex_string(
.ok()
.and_then(|s| {
// Check the digest length
if !against_hint(s.len()) {
if against_hint(s.len()) {
Some(s)
} else {
None