Skip to content

remove some collapsible_if #12539

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
cakebaker merged 2 commits into from
May 31, 2026
Merged

remove some collapsible_if #12539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26974b4
remove some collapsible_if
May 31, 2026
a0cf9a6
Use .ok() == .ok()
oech3 May 31, 2026
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
8 changes: 3 additions & 5 deletions src/uu/unexpand/src/unexpand.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,9 @@ fn parse_tabstops(s: &str) -> Result<TabConfig, ParseError> {

// Handle the increment if specified
// Only add an extra tab stop if increment is non-zero
if let Some(inc) = increment_size {
if inc > 0 {
let last = *nums.last().unwrap();
nums.push(last + inc);
}
if let Some(inc) = increment_size.filter(|&i| i > 0) {
let last = *nums.last().unwrap();
nums.push(last + inc);
}

if let (false, _) = nums
Expand Down
7 changes: 1 addition & 6 deletions src/uucore/src/lib/features/fs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,12 +633,7 @@ pub fn infos_refer_to_same_file(
info1: IOResult<FileInformation>,
info2: IOResult<FileInformation>,
) -> bool {
if let Ok(info1) = info1 {
if let Ok(info2) = info2 {
return info1 == info2;
}
}
false
info1.is_ok() && info1.ok() == info2.ok()
}

/// Converts absolute `path` to be relative to absolute `to` path.
Expand Down
Loading