Skip to content

Commit 96009bb

Browse files
committed
Format with cargo +nightly fmt.
1 parent 5abf3b7 commit 96009bb

File tree

12 files changed

+43
-22
lines changed

12 files changed

+43
-22
lines changed

examples/engine.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
extern crate measurements;
2-
use measurements::{Power, AngularVelocity};
2+
use measurements::{AngularVelocity, Power};
33

44
fn main() {
55
let power = Power::from_ps(225.0);

examples/frequency.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ fn main() {
99
let v = std::f64::consts::PI * d / f.as_period();
1010
println!(
1111
"Maximum speed of a pendulum at {:.1} with max displacement {:.1} is {:.1}",
12-
f,
13-
d,
14-
v
12+
f, d, v
1513
);
1614
}

src/acceleration.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ pub struct Acceleration {
3131
impl Acceleration {
3232
/// Create a new Acceleration from a floating point value in meters per second per second
3333
pub fn from_meters_per_second_per_second(meters_per_second_per_second: f64) -> Acceleration {
34-
Acceleration { meters_per_second_per_second: meters_per_second_per_second }
34+
Acceleration {
35+
meters_per_second_per_second: meters_per_second_per_second,
36+
}
3537
}
3638

3739
/// Create a new Acceleration from a floating point value in metres per second per second

src/angular_velocity.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ pub struct AngularVelocity {
2222
impl AngularVelocity {
2323
/// Create a new AngularVelocity from a floating point value in radians per second
2424
pub fn from_radians_per_second(radians_per_second: f64) -> Self {
25-
AngularVelocity { radians_per_second: radians_per_second }
25+
AngularVelocity {
26+
radians_per_second: radians_per_second,
27+
}
2628
}
2729

2830
/// Create a new AngularVelocity from a floating point value in revolutions per minute (RPM)

src/area.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ pub struct Area {
2626
impl Area {
2727
/// Create new area from floating point value in Square Meters
2828
pub fn from_square_meters(square_meters: f64) -> Self {
29-
Area { square_meters: square_meters }
29+
Area {
30+
square_meters: square_meters,
31+
}
3032
}
3133

3234
/// Create new area from floating point value in Square Metres
@@ -49,7 +51,8 @@ impl Area {
4951
/// Create new area from floating point value in Square Micrometers
5052
pub fn from_square_micrometers(square_micrometers: f64) -> Self {
5153
Self::from_square_meters(
52-
square_micrometers / (length::METER_MICROMETER_FACTOR * length::METER_MICROMETER_FACTOR),
54+
square_micrometers
55+
/ (length::METER_MICROMETER_FACTOR * length::METER_MICROMETER_FACTOR),
5356
)
5457
}
5558

@@ -61,7 +64,8 @@ impl Area {
6164
/// Create new area from floating point value in Square Millimeters
6265
pub fn from_square_millimeters(square_millimeters: f64) -> Self {
6366
Self::from_square_meters(
64-
square_millimeters / (length::METER_MILLIMETER_FACTOR * length::METER_MILLIMETER_FACTOR),
67+
square_millimeters
68+
/ (length::METER_MILLIMETER_FACTOR * length::METER_MILLIMETER_FACTOR),
6569
)
6670
}
6771

@@ -73,7 +77,8 @@ impl Area {
7377
/// Create new area from floating point value in Square Centimeters
7478
pub fn from_square_centimeters(square_centimeters: f64) -> Self {
7579
Self::from_square_meters(
76-
square_centimeters / (length::METER_CENTIMETER_FACTOR * length::METER_CENTIMETER_FACTOR),
80+
square_centimeters
81+
/ (length::METER_CENTIMETER_FACTOR * length::METER_CENTIMETER_FACTOR),
7782
)
7883
}
7984

@@ -97,7 +102,8 @@ impl Area {
97102
/// Create new area from floating point value in Square Hectometers
98103
pub fn from_square_hectometers(square_hectometers: f64) -> Self {
99104
Self::from_square_meters(
100-
square_hectometers / (length::METER_HECTOMETER_FACTOR * length::METER_HECTOMETER_FACTOR),
105+
square_hectometers
106+
/ (length::METER_HECTOMETER_FACTOR * length::METER_HECTOMETER_FACTOR),
101107
)
102108
}
103109

src/force.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ impl Force {
6969
Self::from_newtons(dynes / DYNES_PER_NEWTON)
7070
}
7171

72-
7372
/// Convert this Force into a floating point value in Micronewtons
7473
pub fn as_micronewtons(&self) -> f64 {
7574
self.newtons * 1e6

src/mass.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ pub struct Mass {
6161
impl Mass {
6262
/// Create a Mass from a floating point value in kilograms
6363
pub fn from_kilograms(kilograms: f64) -> Self {
64-
Mass { kilograms: kilograms }
64+
Mass {
65+
kilograms: kilograms,
66+
}
6567
}
6668

6769
/// Create a Mass from a floating point value in micrograms

src/measurement.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ macro_rules! implement_display {
8989
)*)
9090
}
9191

92-
9392
/// This is a special macro that creates the code to implement
9493
/// operator and comparison overrides.
9594
#[macro_export]

src/speed.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ pub struct Speed {
3030
impl Speed {
3131
/// Create a new Speed from a floating point number of m/s
3232
pub fn from_meters_per_second(meters_per_second: f64) -> Speed {
33-
Speed { meters_per_second: meters_per_second }
33+
Speed {
34+
meters_per_second: meters_per_second,
35+
}
3436
}
3537

3638
/// Create a new Speed from a floating point number of m/s
@@ -75,7 +77,6 @@ impl Speed {
7577
self.as_kilometers_per_hour()
7678
}
7779

78-
7980
/// Convert this speed to a floating point number of miles/hour (mph)
8081
pub fn as_miles_per_hour(&self) -> f64 {
8182
(self.meters_per_second / 1609.0) * 3600.0

src/temperature.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ pub struct TemperatureDelta {
4040
impl TemperatureDelta {
4141
/// Create a new TemperatureDelta from a floating point value in Kelvin
4242
pub fn from_kelvin(kelvin_degrees: f64) -> Self {
43-
TemperatureDelta { kelvin_degrees: kelvin_degrees }
43+
TemperatureDelta {
44+
kelvin_degrees: kelvin_degrees,
45+
}
4446
}
4547

4648
/// Create a new TemperatureDelta from a floating point value in Celsius
@@ -50,12 +52,16 @@ impl TemperatureDelta {
5052

5153
/// Create a new TemperatureDelta from a floating point value in Fahrenheit
5254
pub fn from_fahrenheit(farenheit_degrees: f64) -> Self {
53-
TemperatureDelta { kelvin_degrees: farenheit_degrees / 1.8 }
55+
TemperatureDelta {
56+
kelvin_degrees: farenheit_degrees / 1.8,
57+
}
5458
}
5559

5660
/// Create a new TemperatureDelta from a floating point value in Rankine
5761
pub fn from_rankine(rankine_degrees: f64) -> Self {
58-
TemperatureDelta { kelvin_degrees: rankine_degrees / 1.8 }
62+
TemperatureDelta {
63+
kelvin_degrees: rankine_degrees / 1.8,
64+
}
5965
}
6066

6167
/// Convert this TemperatureDelta to a floating point value in Kelvin
@@ -82,7 +88,9 @@ impl TemperatureDelta {
8288
impl Temperature {
8389
/// Create a new Temperature from a floating point value in Kelvin
8490
pub fn from_kelvin(degrees_kelvin: f64) -> Self {
85-
Temperature { degrees_kelvin: degrees_kelvin }
91+
Temperature {
92+
degrees_kelvin: degrees_kelvin,
93+
}
8694
}
8795

8896
/// Create a new Temperature from a floating point value in Celsius

0 commit comments

Comments
 (0)