Skip to content

Commit 5b8d747

Browse files
committed
Ran cargo fmt.
1 parent 8f66355 commit 5b8d747

File tree

10 files changed

+77
-81
lines changed

10 files changed

+77
-81
lines changed

src/length.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const METER_MILE_FACTOR: f64 = 0.000621371192237;
3030
/// ```
3131
#[derive(Copy, Clone, Debug)]
3232
pub struct Length {
33-
meters: f64
33+
meters: f64,
3434
}
3535

3636
impl Length {

src/measurement.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,8 @@ macro_rules! implement_measurement {
5656
}
5757
}
5858

59-
///
60-
/// Dividing a `$t` by another `$` returns a ratio.
61-
///
59+
// Dividing a `$t` by another `$` returns a ratio.
60+
//
6261
impl ::std::ops::Div<$t> for $t {
6362
type Output = f64;
6463

@@ -67,9 +66,8 @@ macro_rules! implement_measurement {
6766
}
6867
}
6968

70-
///
71-
/// Dividing a `$` by a factor returns a new portion of the measurement.
72-
///
69+
// Dividing a `$` by a factor returns a new portion of the measurement.
70+
//
7371
impl ::std::ops::Div<f64> for $t {
7472
type Output = Self;
7573

@@ -78,9 +76,8 @@ macro_rules! implement_measurement {
7876
}
7977
}
8078

81-
///
82-
/// Multiplying a `$t` by another `$t` returns the product of those measurements.
83-
///
79+
// Multiplying a `$t` by another `$t` returns the product of those measurements.
80+
//
8481
impl ::std::ops::Mul<$t> for $t {
8582
type Output = Self;
8683

@@ -89,9 +86,8 @@ macro_rules! implement_measurement {
8986
}
9087
}
9188

92-
///
93-
/// Multiplying a `$t` by a factor increases (or decreases) that measurement a number of times.
94-
///
89+
// Multiplying a `$t` by a factor increases (or decreases) that measurement a number of times.
90+
//
9591
impl ::std::ops::Mul<f64> for $t {
9692
type Output = Self;
9793

src/pressure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use super::measurement::*;
1414
/// ```
1515
#[derive(Copy, Clone, Debug)]
1616
pub struct Pressure {
17-
millibars: f64
17+
millibars: f64,
1818
}
1919

2020
impl Pressure {

src/temperature.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use super::measurement::*;
1313
/// ```
1414
#[derive(Copy, Clone, Debug)]
1515
pub struct Temperature {
16-
kelvin: f64
16+
kelvin: f64,
1717
}
1818

1919
impl Temperature {

src/tests/length_tests.rs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
use length::*;
2-
use super::{assert_almost_eq};
2+
use super::assert_almost_eq;
33

44
// Metric
55
#[test]
66
fn nanometers() {
77
let i1 = Length::from_meters(100.0);
88
let r1 = i1.as_nanometers();
9-
9+
1010
let i2 = Length::from_nanometers(100.0);
1111
let r2 = i2.as_meters();
12-
12+
1313
assert_almost_eq(r1, 100000000000.0);
1414
assert_almost_eq(r2, 1.0E-7);
1515
}
@@ -18,10 +18,10 @@ fn nanometers() {
1818
fn micrometers() {
1919
let i1 = Length::from_meters(100.0);
2020
let r1 = i1.as_micrometers();
21-
21+
2222
let i2 = Length::from_micrometers(100.0);
2323
let r2 = i2.as_meters();
24-
24+
2525
assert_almost_eq(r1, 100000000.0);
2626
assert_almost_eq(r2, 0.0001);
2727
}
@@ -30,10 +30,10 @@ fn micrometers() {
3030
fn millimeters() {
3131
let i1 = Length::from_meters(100.0);
3232
let r1 = i1.as_millimeters();
33-
33+
3434
let i2 = Length::from_millimeters(100.0);
3535
let r2 = i2.as_meters();
36-
36+
3737
assert_almost_eq(r1, 100000.0);
3838
assert_almost_eq(r2, 0.1);
3939
}
@@ -42,10 +42,10 @@ fn millimeters() {
4242
fn centimeters() {
4343
let i1 = Length::from_meters(100.0);
4444
let r1 = i1.as_centimeters();
45-
45+
4646
let i2 = Length::from_centimeters(100.0);
4747
let r2 = i2.as_meters();
48-
48+
4949
assert_almost_eq(r1, 10000.0);
5050
assert_almost_eq(r2, 1.0);
5151
}
@@ -54,10 +54,10 @@ fn centimeters() {
5454
fn decameter() {
5555
let i1 = Length::from_meters(100.0);
5656
let r1 = i1.as_decameters();
57-
57+
5858
let i2 = Length::from_decameters(100.0);
5959
let r2 = i2.as_meters();
60-
60+
6161
assert_almost_eq(r1, 10.0);
6262
assert_almost_eq(r2, 1000.0);
6363
}
@@ -66,10 +66,10 @@ fn decameter() {
6666
fn hectometer() {
6767
let i1 = Length::from_meters(100.0);
6868
let r1 = i1.as_hectometer();
69-
69+
7070
let i2 = Length::from_hectometers(100.0);
7171
let r2 = i2.as_meters();
72-
72+
7373
assert_almost_eq(r1, 1.0);
7474
assert_almost_eq(r2, 10000.0);
7575
}
@@ -78,10 +78,10 @@ fn hectometer() {
7878
fn kilometer() {
7979
let i1 = Length::from_meters(100.0);
8080
let r1 = i1.as_kilometers();
81-
81+
8282
let i2 = Length::from_kilometers(100.0);
8383
let r2 = i2.as_meters();
84-
84+
8585
assert_almost_eq(r1, 0.1);
8686
assert_almost_eq(r2, 100000.0);
8787
}
@@ -91,10 +91,10 @@ fn kilometer() {
9191
fn inches() {
9292
let i1 = Length::from_meters(100.0);
9393
let r1 = i1.as_inches();
94-
94+
9595
let i2 = Length::from_inches(100.0);
9696
let r2 = i2.as_meters();
97-
97+
9898
assert_almost_eq(r1, 3937.00787402);
9999
assert_almost_eq(r2, 2.54);
100100
}
@@ -103,10 +103,10 @@ fn inches() {
103103
fn feet() {
104104
let i1 = Length::from_meters(100.0);
105105
let r1 = i1.as_feet();
106-
106+
107107
let i2 = Length::from_feet(100.0);
108108
let r2 = i2.as_meters();
109-
109+
110110
assert_almost_eq(r1, 328.083989501);
111111
assert_almost_eq(r2, 30.48);
112112
}
@@ -115,10 +115,10 @@ fn feet() {
115115
fn yards() {
116116
let i1 = Length::from_meters(100.0);
117117
let r1 = i1.as_yards();
118-
118+
119119
let i2 = Length::from_yards(100.0);
120120
let r2 = i2.as_meters();
121-
121+
122122
assert_almost_eq(r1, 109.361329834);
123123
assert_almost_eq(r2, 91.44);
124124
}
@@ -127,10 +127,10 @@ fn yards() {
127127
fn furlongs() {
128128
let i1 = Length::from_meters(100.0);
129129
let r1 = i1.as_furlongs();
130-
130+
131131
let i2 = Length::from_furlongs(100.0);
132132
let r2 = i2.as_meters();
133-
133+
134134
assert_almost_eq(r1, 0.49709695379);
135135
assert_almost_eq(r2, 20116.8);
136136
}
@@ -139,10 +139,10 @@ fn furlongs() {
139139
fn miles() {
140140
let i1 = Length::from_meters(100.0);
141141
let r1 = i1.as_miles();
142-
142+
143143
let i2 = Length::from_miles(100.0);
144144
let r2 = i2.as_meters();
145-
145+
146146
assert_almost_eq(r1, 0.0621371192237);
147147
assert_almost_eq(r2, 160934.4);
148148
}

src/tests/temperature_tests.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
use temperature::*;
2-
use super::{assert_almost_eq};
2+
use super::assert_almost_eq;
33

44
// Temperature Units
55
#[test]
66
fn kelvin() {
77
let t = Temperature::from_kelvin(100.0);
88
let o = t.as_kelvin();
9-
9+
1010
assert_almost_eq(o, 100.0);
1111
}
1212

1313
#[test]
1414
fn celsius() {
1515
let t = Temperature::from_kelvin(100.0);
1616
let o = t.as_celsius();
17-
17+
1818
assert_almost_eq(o, -173.15);
1919
}
2020

2121
#[test]
2222
fn fahrenheit() {
2323
let t = Temperature::from_kelvin(100.0);
2424
let o = t.as_fahrenheit();
25-
25+
2626
assert_almost_eq(o, -279.67);
2727
}
2828

2929
#[test]
3030
fn rankine() {
3131
let t = Temperature::from_kelvin(100.0);
3232
let o = t.as_rankine();
33-
33+
3434
assert_almost_eq(o, 180.0);
3535
}
3636

0 commit comments

Comments
 (0)