Skip to content

Commit 52bee9d

Browse files
committed
Fix errors in Pressure and add formatting.
Also update example.
1 parent f09c86a commit 52bee9d

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

examples/format_test.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
extern crate measurements;
22
use measurements::Temperature;
33
use measurements::Length;
4+
use measurements::Pressure;
45
fn main() {
5-
let t = Temperature::from_celsius(0.1);
6-
let d = Length::from_meters(10000.1);
7-
println!("{0:.9} outside", t);
8-
println!("{0:.9} C outside", t.as_celsius());
9-
println!("{0:.3} away", d);
10-
println!("{0:.3} m away", d.as_meters());
6+
let t = Temperature::from_celsius(123.456);
7+
let d = Length::from_meters(123.456);
8+
let p = Pressure::from_pascals(123.456);
9+
println!("Temp of {0:.5} outside", t);
10+
println!("Temp of {0:.5} C outside", t.as_celsius());
11+
println!("Distance of {0:.5}", d);
12+
println!("Distance of {0:.5} m", d.as_meters());
13+
println!("Pressure of {0:.5}", p);
14+
println!("Pressure of {0:.5} Pa", p.as_pascals());
1115
}

src/pressure.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ impl Pressure {
2323
}
2424

2525
pub fn from_pascals(pascals: f64) -> Pressure {
26-
Self::from_hectopascals(pascals * 100.0)
26+
Self::from_millibars(pascals / 100.0)
2727
}
2828

2929
pub fn from_kilopascals(kilopascals: f64) -> Pressure {
30-
Self::from_hectopascals(kilopascals / 10.0)
30+
Self::from_millibars(kilopascals * 10.0)
3131
}
3232

3333
pub fn from_millibars(millibars: f64) -> Pressure {
@@ -89,6 +89,8 @@ implement_measurement! { Pressure }
8989

9090
impl ::std::fmt::Display for Pressure {
9191
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
92-
write!(f, "{:.1} Pa", self.as_pascals())
92+
let p = f.precision().unwrap_or(1);
93+
let w = f.width().unwrap_or(0);
94+
write!(f, "{value:width$.prec$}\u{00A0}Pa", prec=p, width=w, value=self.as_pascals())
9395
}
9496
}

0 commit comments

Comments
 (0)