Skip to content

extendedbigdecimal.rs: dedup match #13562

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

Closed
oech3 wants to merge 1 commit into from
Closed

extendedbigdecimal.rs: dedup match #13562

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
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)

@sylvestre sylvestre Jul 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i prefer the original version

@oech3 oech3 Jul 27, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If so, I'd just add expect(clippy::...

| (Self::MinusInfinity, Self::MinusInfinity)
| (Self::MinusZero, Self::MinusZero) => true,
_ => false,

@sylvestre sylvestre Jul 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe don't use _ here

}
}
}
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