Skip to content

Bump bigdecimal & fix failing test #7630

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
sylvestre merged 3 commits into from
Apr 1, 2025
Merged

Bump bigdecimal & fix failing test #7630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaa8332
Bump bigdecimal from 0.4.7 to 0.4.8
cakebaker Apr 1, 2025
636e4a7
uucore/format: remove Display impl
cakebaker Apr 1, 2025
60ebace
uucore/format: remove TODOs related to bigdecimal
cakebaker Apr 1, 2025
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 0 additions & 32 deletions src/uucore/src/lib/features/format/extendedbigdecimal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
//! assert_eq!(summand1 + summand2, ExtendedBigDecimal::Infinity);
//! ```
use std::cmp::Ordering;
use std::fmt::Display;
use std::ops::Add;
use std::ops::Neg;

Expand Down Expand Up @@ -110,25 +109,6 @@ impl ExtendedBigDecimal {
}
}

impl Display for ExtendedBigDecimal {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Self::BigDecimal(x) => {
let (n, p) = x.as_bigint_and_exponent();
match p {
0 => Self::BigDecimal(BigDecimal::new(n * 10, 1)).fmt(f),
_ => x.fmt(f),
}
}
Self::Infinity => f32::INFINITY.fmt(f),
Self::MinusInfinity => f32::NEG_INFINITY.fmt(f),
Self::MinusZero => (-0.0f32).fmt(f),
Self::Nan => "nan".fmt(f),
Self::MinusNan => "-nan".fmt(f),
}
}
}

impl Zero for ExtendedBigDecimal {
fn zero() -> Self {
Self::BigDecimal(BigDecimal::zero())
Expand Down Expand Up @@ -281,16 +261,4 @@ mod tests {
_ => unreachable!(),
}
}

#[test]
fn test_display() {
assert_eq!(
format!("{}", ExtendedBigDecimal::BigDecimal(BigDecimal::zero())),
"0.0"
);
assert_eq!(format!("{}", ExtendedBigDecimal::Infinity), "inf");
assert_eq!(format!("{}", ExtendedBigDecimal::MinusInfinity), "-inf");
assert_eq!(format!("{}", ExtendedBigDecimal::Nan), "nan");
assert_eq!(format!("{}", ExtendedBigDecimal::MinusZero), "-0");
}
}
12 changes: 1 addition & 11 deletions src/uucore/src/lib/features/format/num_format.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,13 +246,7 @@ impl Formatter<&ExtendedBigDecimal> for Float {
*/
let (abs, negative) = match e {
ExtendedBigDecimal::BigDecimal(bd) => {
// Workaround printing bug in BigDecimal, force 0 to scale 0.
// TODO: Remove after https://github.com/akubera/bigdecimal-rs/issues/144 is fixed.
if bd.is_zero() {
(ExtendedBigDecimal::zero(), false)
} else {
(ExtendedBigDecimal::BigDecimal(bd.abs()), bd.is_negative())
}
(ExtendedBigDecimal::BigDecimal(bd.abs()), bd.is_negative())
}
ExtendedBigDecimal::MinusZero => (ExtendedBigDecimal::zero(), true),
ExtendedBigDecimal::Infinity => (ExtendedBigDecimal::Infinity, false),
Expand Down Expand Up @@ -730,12 +724,8 @@ mod test {
}

#[test]
#[ignore = "Need https://github.com/akubera/bigdecimal-rs/issues/144 to be fixed"]
fn decimal_float_zero() {
use super::format_float_decimal;
// We've had issues with "0e10"/"0e-10" formatting.
// TODO: Enable after https://github.com/akubera/bigdecimal-rs/issues/144 is fixed,
// as our workaround is in .fmt.
let f = |digits, scale| {
format_float_decimal(&BigDecimal::from_bigint(digits, scale), 6, ForceDecimal::No)
};
Expand Down
Loading