Skip to content
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.

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

Fix negative BigInt formatting #4082

Merged
merged 4 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
* Fixed many proc-macro generated `impl` blocks missing `#[automatically_derived]`, affecting test coverage.
[#4078](https://github.com/rustwasm/wasm-bindgen/pull/4078)

* Fixed negative `BigInt` values being incorrectly formatted with two minus signs.
[#4082](https://github.com/rustwasm/wasm-bindgen/pull/4082)

--------------------------------------------------------------------------------

## [0.2.93](https://github.com/rustwasm/wasm-bindgen/compare/0.2.92...0.2.93)
Expand Down
31 changes: 21 additions & 10 deletions crates/js-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1387,6 +1387,16 @@ impl BigInt {
.pow(JsValue::as_ref(rhs))
.unchecked_into()
}

/// Returns a tuple of this [`BigInt`]'s absolute value along with a
/// [`bool`] indicating whether the [`BigInt`] was negative.
fn abs(&self) -> (Self, bool) {
if self >= &BigInt::from(0) {
(self.clone(), false)
} else {
(-self, true)
}
}
}

macro_rules! bigint_from {
Expand Down Expand Up @@ -1493,41 +1503,42 @@ impl fmt::Debug for BigInt {
impl fmt::Display for BigInt {
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.pad_integral(self >= &BigInt::from(0), "", &self.to_string_unchecked(10))
let (abs, is_neg) = self.abs();
f.pad_integral(is_neg, "", &abs.to_string_unchecked(10))
}
}

impl fmt::Binary for BigInt {
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.pad_integral(self >= &BigInt::from(0), "0b", &self.to_string_unchecked(2))
let (abs, is_neg) = self.abs();
f.pad_integral(is_neg, "0b", &abs.to_string_unchecked(2))
}
}

impl fmt::Octal for BigInt {
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.pad_integral(self >= &BigInt::from(0), "0o", &self.to_string_unchecked(8))
let (abs, is_neg) = self.abs();
f.pad_integral(is_neg, "0o", &abs.to_string_unchecked(8))
}
}

impl fmt::LowerHex for BigInt {
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.pad_integral(
self >= &BigInt::from(0),
"0x",
&self.to_string_unchecked(16),
)
let (abs, is_neg) = self.abs();
f.pad_integral(is_neg, "0x", &abs.to_string_unchecked(16))
}
}

impl fmt::UpperHex for BigInt {
#[inline]
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut s: String = self.to_string_unchecked(16);
let (abs, is_neg) = self.abs();
let mut s: String = abs.to_string_unchecked(16);
s.make_ascii_uppercase();
f.pad_integral(self >= &BigInt::from(0), "0x", &s)
f.pad_integral(is_neg, "0x", &s)
}
}

Expand Down