Skip to content

fix & enable clippy::match_same_arms #13541

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

Draft
oech3 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix & enable clippy::match_same_arms #13541

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
1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,6 @@ multiple_crate_versions = "allow" # 2882
missing_errors_doc = "allow" # 1572
missing_panics_doc = "allow" # 946
must_use_candidate = "allow" # 322
match_same_arms = "allow" # 204
cast_possible_truncation = "allow" # 122
too_many_lines = "allow" # 101
cast_possible_wrap = "allow" # 78
Expand Down
1 change: 1 addition & 0 deletions src/uu/date/src/format_modifiers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ fn is_space_padded_specifier(specifier: &str) -> bool {
/// Returns the default width for a specifier.
/// This is used when a flag like `_` is used without an explicit width.
fn get_default_width(specifier: &str) -> usize {
#[allow(clippy::match_same_arms)] // needs comment
match specifier.chars().last() {
// Day of month: 2 digits (01-31)
Some('d') | Some('e') => 2,
Expand Down
4 changes: 0 additions & 4 deletions src/uu/ls/src/colors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,10 +673,6 @@ fn parse_funky_string(
state = State::Hex(0);
idx += 1;
}
b'a' | b'b' | b'e' | b'f' | b'n' | b'r' | b't' | b'v' | b'?' | b'_' => {
Comment thread
sylvestre marked this conversation as resolved.
state = State::Ground;
idx += 1;
}
_ => {
state = State::Ground;
idx += 1;
Expand Down
11 changes: 2 additions & 9 deletions src/uu/ls/src/ls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,8 @@ enum LsError {
impl UError for LsError {
fn code(&self) -> i32 {
match self {
Self::InvalidLineWidth(_) => 2,
Self::IOError(_) | Self::WriteError(_) => 1,
Self::IOErrorContext(_, _, false) => 1,
Self::IOErrorContext(_, _, true) => 2,
Self::BlockSizeParseError(_) => 2,
Self::DiredAndZeroAreIncompatible => 2,
Self::AlreadyListedError(_) => 2,
Self::TimeStyleParseError(_) => 2,
Self::InvalidTabSize(_) => 2,
Self::IOError(_) | Self::WriteError(_) | Self::IOErrorContext(_, _, false) => 1,
_ => 2,
}
}
}
Expand Down
8 changes: 1 addition & 7 deletions src/uu/runcon/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,8 @@ impl Display for RunconError {
impl UError for Error {
fn code(&self) -> i32 {
match self {
Self::MissingCommand => error_exit_status::ANOTHER_ERROR,
Self::SELinuxNotEnabled => error_exit_status::ANOTHER_ERROR,
Self::NotUTF8(_) => error_exit_status::ANOTHER_ERROR,
Self::CommandLine(e) => e.exit_code(),
Self::SELinux { .. } => error_exit_status::ANOTHER_ERROR,
Self::Io { .. } => error_exit_status::ANOTHER_ERROR,
Self::Io1 { .. } => error_exit_status::ANOTHER_ERROR,
Self::Write(_) => error_exit_status::ANOTHER_ERROR,
_ => error_exit_status::ANOTHER_ERROR,
}
}
}
26 changes: 12 additions & 14 deletions src/uu/stat/src/stat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,7 @@ fn print_integer(
""
};
let extended = match precision {
Precision::NotSpecified => format!("{prefix}{arg}"),
Precision::NoNumber => format!("{prefix}{arg}"),
Precision::NotSpecified | Precision::NoNumber => format!("{prefix}{arg}"),
Precision::Number(p) => format!("{prefix}{arg:0>p$}"),
};
pad_and_print(&extended, flags.left, width, padding_char);
Expand Down Expand Up @@ -618,13 +617,14 @@ fn precision_trunc(num: f64, precision: Precision) -> String {
let num_str = num.to_string();
let n = num_str.len();
match (num_str.find('.'), precision) {
(None, Precision::NotSpecified) => num_str,
(None, Precision::NoNumber) => num_str,
(None, Precision::Number(0)) => num_str,
(None, Precision::NotSpecified)
| (None, Precision::NoNumber)
| (None, Precision::Number(0))
| (Some(_), Precision::NoNumber) => num_str,
(None, Precision::Number(p)) => format!("{num_str}.{zeros}", zeros = "0".repeat(p)),
(Some(i), Precision::NotSpecified) => num_str[..i].to_string(),
(Some(_), Precision::NoNumber) => num_str,
(Some(i), Precision::Number(0)) => num_str[..i].to_string(),
(Some(i), Precision::NotSpecified) | (Some(i), Precision::Number(0)) => {
num_str[..i].to_string()
}
(Some(i), Precision::Number(p)) if p < n - i => num_str[..i + 1 + p].to_string(),
(Some(i), Precision::Number(p)) => {
format!("{num_str}{zeros}", zeros = "0".repeat(p - (n - i - 1)))
Expand Down Expand Up @@ -668,8 +668,7 @@ fn print_unsigned(
Cow::Borrowed(num.as_str())
};
let s = match precision {
Precision::NotSpecified => s,
Precision::NoNumber => s,
Precision::NotSpecified | Precision::NoNumber => s,
Precision::Number(p) => format!("{s:0>p$}").into(),
};
pad_and_print(&s, flags.left, width, padding_char);
Expand All @@ -693,8 +692,7 @@ fn print_unsigned_oct(
) {
let prefix = if flags.alter { "0" } else { "" };
let s = match precision {
Precision::NotSpecified => format!("{prefix}{num:o}"),
Precision::NoNumber => format!("{prefix}{num:o}"),
Precision::NotSpecified | Precision::NoNumber => format!("{prefix}{num:o}"),
Precision::Number(p) => format!("{prefix}{num:0>p$o}"),
};
pad_and_print(&s, flags.left, width, padding_char);
Expand All @@ -718,8 +716,7 @@ fn print_unsigned_hex(
) {
let prefix = if flags.alter { "0x" } else { "" };
let s = match precision {
Precision::NotSpecified => format!("{prefix}{num:x}"),
Precision::NoNumber => format!("{prefix}{num:x}"),
Precision::NotSpecified | Precision::NoNumber => format!("{prefix}{num:x}"),
Precision::Number(p) => format!("{prefix}{num:0>p$x}"),
};
pad_and_print(&s, flags.left, width, padding_char);
Expand All @@ -732,6 +729,7 @@ fn print_raw_byte(byte: u8) {
impl Stater {
fn process_flags(chars: &[char], i: &mut usize, bound: usize, flag: &mut Flags) {
while *i < bound {
#[expect(clippy::match_same_arms)] // needs comment
match chars[*i] {
'#' => flag.alter = true,
'0' => flag.zero = true,
Expand Down
1 change: 1 addition & 0 deletions src/uucore/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
writeln!(embedded_file)?;

// Generate optimized lookup function instead of HashMap
writeln!(embedded_file, "#[expect(clippy::match_same_arms)]")?;
writeln!(
embedded_file,
"pub fn get_embedded_locale(key: &str) -> Option<&'static str> {{"
Expand Down
81 changes: 31 additions & 50 deletions src/uucore/src/lib/features/extendedbigdecimal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,21 +162,20 @@ impl Add for ExtendedBigDecimal {
fn add(self, other: Self) -> Self {
match (self, other) {
(Self::BigDecimal(m), Self::BigDecimal(n)) => Self::BigDecimal(m.add(n)),
(Self::BigDecimal(_), Self::MinusInfinity) => Self::MinusInfinity,
(Self::BigDecimal(_), Self::Infinity) => Self::Infinity,
(Self::BigDecimal(_), Self::MinusInfinity)
| (Self::MinusInfinity, Self::BigDecimal(_))
| (Self::MinusInfinity, Self::MinusInfinity)
| (Self::MinusInfinity, Self::MinusZero) => Self::MinusInfinity,
(Self::BigDecimal(_), Self::Infinity)
| (Self::Infinity, Self::BigDecimal(_))
| (Self::Infinity, Self::Infinity)
| (Self::Infinity, Self::MinusZero) => Self::Infinity,
(Self::BigDecimal(m), Self::MinusZero) => Self::BigDecimal(m),
(Self::Infinity, Self::BigDecimal(_)) => Self::Infinity,
(Self::Infinity, Self::Infinity) => Self::Infinity,
(Self::Infinity, Self::MinusZero) => Self::Infinity,
(Self::Infinity, Self::MinusInfinity) => Self::Nan,
(Self::MinusInfinity, Self::BigDecimal(_)) => Self::MinusInfinity,
(Self::MinusInfinity, Self::MinusInfinity) => Self::MinusInfinity,
(Self::MinusInfinity, Self::MinusZero) => Self::MinusInfinity,
(Self::MinusInfinity, Self::Infinity) => Self::Nan,
(Self::Nan, _) => Self::Nan,
(_, Self::Nan) => Self::Nan,
(Self::MinusNan, _) => Self::MinusNan,
(_, Self::MinusNan) => Self::MinusNan,
(Self::Infinity, Self::MinusInfinity)
| (Self::MinusInfinity, Self::Infinity)
| (Self::Nan, _)
| (_, Self::Nan) => Self::Nan,
(Self::MinusNan, _) | (_, Self::MinusNan) => Self::MinusNan,
(Self::MinusZero, other) => other,
}
}
Expand All @@ -186,25 +185,10 @@ impl PartialEq for ExtendedBigDecimal {
fn eq(&self, other: &Self) -> bool {
match (self, other) {
(Self::BigDecimal(m), Self::BigDecimal(n)) => m.eq(n),
(Self::BigDecimal(_), Self::MinusInfinity) => false,
(Self::BigDecimal(_), Self::Infinity) => false,
(Self::BigDecimal(_), Self::MinusZero) => false,
(Self::Infinity, Self::BigDecimal(_)) => false,
(Self::Infinity, Self::Infinity) => true,
(Self::Infinity, Self::MinusZero) => false,
(Self::Infinity, Self::MinusInfinity) => false,
(Self::MinusInfinity, Self::BigDecimal(_)) => false,
(Self::MinusInfinity, Self::Infinity) => false,
(Self::MinusInfinity, Self::MinusZero) => false,
(Self::MinusInfinity, Self::MinusInfinity) => true,
(Self::MinusZero, Self::BigDecimal(_)) => false,
(Self::MinusZero, Self::Infinity) => false,
(Self::MinusZero, Self::MinusZero) => true,
(Self::MinusZero, Self::MinusInfinity) => false,
(Self::Nan, _) => false,
(Self::MinusNan, _) => false,
(_, Self::Nan) => false,
(_, Self::MinusNan) => false,
(Self::Infinity, Self::Infinity)
| (Self::MinusInfinity, Self::MinusInfinity)
| (Self::MinusZero, Self::MinusZero) => true,
_ => false,
}
}
}
Expand All @@ -213,25 +197,22 @@ impl PartialOrd for ExtendedBigDecimal {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
match (self, other) {
(Self::BigDecimal(m), Self::BigDecimal(n)) => m.partial_cmp(n),
(Self::BigDecimal(_), Self::MinusInfinity) => Some(Ordering::Greater),
(Self::BigDecimal(_), Self::Infinity) => Some(Ordering::Less),
(Self::BigDecimal(_), Self::MinusInfinity)
| (Self::Infinity, Self::BigDecimal(_))
| (Self::Infinity, Self::MinusZero)
| (Self::Infinity, Self::MinusInfinity)
| (Self::MinusZero, Self::MinusInfinity) => Some(Ordering::Greater),
(Self::BigDecimal(_), Self::Infinity)
| (Self::MinusInfinity, Self::BigDecimal(_))
| (Self::MinusInfinity, Self::Infinity)
| (Self::MinusInfinity, Self::MinusZero)
| (Self::MinusZero, Self::Infinity) => Some(Ordering::Less),
(Self::BigDecimal(m), Self::MinusZero) => m.partial_cmp(&BigDecimal::zero()),
(Self::Infinity, Self::BigDecimal(_)) => Some(Ordering::Greater),
(Self::Infinity, Self::Infinity) => Some(Ordering::Equal),
(Self::Infinity, Self::MinusZero) => Some(Ordering::Greater),
(Self::Infinity, Self::MinusInfinity) => Some(Ordering::Greater),
(Self::MinusInfinity, Self::BigDecimal(_)) => Some(Ordering::Less),
(Self::MinusInfinity, Self::Infinity) => Some(Ordering::Less),
(Self::MinusInfinity, Self::MinusZero) => Some(Ordering::Less),
(Self::MinusInfinity, Self::MinusInfinity) => Some(Ordering::Equal),
(Self::Infinity, Self::Infinity)
| (Self::MinusInfinity, Self::MinusInfinity)
| (Self::MinusZero, Self::MinusZero) => Some(Ordering::Equal),
(Self::MinusZero, Self::BigDecimal(n)) => BigDecimal::zero().partial_cmp(n),
(Self::MinusZero, Self::Infinity) => Some(Ordering::Less),
(Self::MinusZero, Self::MinusZero) => Some(Ordering::Equal),
(Self::MinusZero, Self::MinusInfinity) => Some(Ordering::Greater),
(Self::Nan, _) => None,
(Self::MinusNan, _) => None,
(_, Self::Nan) => None,
(_, Self::MinusNan) => None,
_ => None,
}
}
}
Expand Down
Loading