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.

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

Jump to bottom

Preserve '.0' when Displaying Number #919

Merged
merged 3 commits into from Aug 21, 2022
Merged

Preserve '.0' when Displaying Number #919

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de251c8
Add test of Display for Number containing float
dtolnay Aug 21, 2022
8ba8541
Preserve '.0' when Displaying Number
dtolnay Aug 21, 2022
cb2515b
Make Display for Number produce the same representation as serializing
dtolnay Aug 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 2 additions & 10 deletions src/number.rs
View file
Open in desktop
Expand Up @@ -294,7 +294,8 @@ impl Display for Number {
match self.n {
N::PosInt(u) => Display::fmt(&u, formatter),
N::NegInt(i) => Display::fmt(&i, formatter),
N::Float(f) => Display::fmt(&f, formatter),
// Preserve `.0` on integral values, which Display hides
N::Float(f) => Debug::fmt(&f, formatter),
Copy link
Member Author

Choose a reason for hiding this comment

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

Actually we should just serialize using ryu and itoa, like the Serializer does, or maybe even go through the Serializer itself. std::fmt produces a worse representation for floats, like 120000000000000000000000000000000000000000 instead of 1.2e41.

}
}

Expand All @@ -305,15 +306,6 @@ impl Display for Number {
}

impl Debug for Number {
#[cfg(not(feature = "arbitrary_precision"))]
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
match self.n {
N::PosInt(_) | N::NegInt(_) => write!(formatter, "Number({})", self),
N::Float(f) => write!(formatter, "Number({:?})", f),
}
}

#[cfg(feature = "arbitrary_precision")]
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
write!(formatter, "Number({})", self)
}
Expand Down
1 change: 1 addition & 0 deletions tests/debug.rs
View file
Open in desktop
Expand Up @@ -27,6 +27,7 @@ fn value_number() {
assert_eq!(format!("{:?}", json!(1)), "Number(1)");
assert_eq!(format!("{:?}", json!(-1)), "Number(-1)");
assert_eq!(format!("{:?}", json!(1.0)), "Number(1.0)");
assert_eq!(Number::from_f64(1.0).unwrap().to_string(), "1.0"); // not just "1"
}

#[test]
Expand Down