eryn/sibil
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Couple more tweaks to number printing

Browse source
This commit is contained in:
Eryn Wells 2017-04-22 15:05:51 -07:00
parent 15910480ee
commit 2f8051135f
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
types/src/number/mod.rs
View file

@ -66,10 +66,8 @@ impl Number {
impl fmt::Display for Number { impl fmt::Display for Number {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.real).and_then(|r| match self.imag { write!(f, "{}", self.real).and_then(
Some(ref imag) => write!(f, "{}i", imag), |r| self.imag.map(|i| write!(f, "{:+}i", i)).unwrap_or(Ok(r)))
None => Ok(r),
})
} }
} }

1
types/src/number/real.rs
View file

@ -130,6 +130,7 @@ impl PartialEq for Real {
impl fmt::Display for Real { impl fmt::Display for Real {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
// TODO: Figure out how to print the sign if `f.sign_plus() == true`.
match *self { match *self {
Real::Integer(v) => write!(f, "{}", v), Real::Integer(v) => write!(f, "{}", v),
Real::Rational(p, q) => write!(f, "{}/{}", p, q), Real::Rational(p, q) => write!(f, "{}/{}", p, q),