Renamed weight to mass.

Author: thejpster

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "measurements"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["James O'Cull <jocull@delmarsd.com>",
           "Jonathan Pallant <github@thejpster.org.uk>",
           "Hannah McLaughlin <h@mcla.ug>"]

examples/format_test.rs

@@ -3,7 +3,7 @@ use measurements::Temperature;
 use measurements::Length;
 use measurements::Pressure;
 use measurements::Volume;
-use measurements::Weight;
+use measurements::Mass;
 use measurements::Speed;
 use measurements::Acceleration;
 use measurements::Energy;
@@ -17,7 +17,7 @@ fn main() {
         println!("Distance of {0:.3}", Length::from_meters(val));
         println!("Pressure of {0:.3}", Pressure::from_millibars(val));
         println!("Volume of {0:.3}", Volume::from_litres(val));
-        println!("Weight of {0:.3}", Weight::from_kilograms(val));
+        println!("Mass of {0:.3}", Mass::from_kilograms(val));
         println!("Speed of {0:.3}", Speed::from_meters_per_second(val));
         println!("Acceleration of {0:.3}", Acceleration::from_meters_per_second_per_second(val));
         println!("Energy of {0:.3}", Energy::from_joules(val));

src/lib.rs

@@ -8,8 +8,8 @@ pub use length::Length;
 pub mod temperature;
 pub use temperature::{Temperature, TemperatureDelta};
 
-pub mod weight;
-pub use weight::Weight;
+pub mod mass;
+pub use mass::Mass;
 
 pub mod volume;
 pub use volume::Volume;

src/weight.rs renamed to src/mass.rs

@@ -1,28 +1,28 @@
 use super::measurement::*;
 
-/// The `Weight` struct can be used to deal with weights in a common way.
+/// The `Mass` struct can be used to deal with masss in a common way.
 ///
 /// #Example
 ///
 /// ```
-/// use measurements::Weight;
+/// use measurements::Mass;
 ///
-/// let metric_ton = Weight::from_metric_tons(1.0);
+/// let metric_ton = Mass::from_metric_tons(1.0);
 /// let united_states_tons = metric_ton.as_short_tons();
 /// let united_states_pounds = metric_ton.as_pounds();
 /// println!(
 ///     "One metric ton is {} U.S. tons - that's {} pounds!",
 ///     united_states_tons, united_states_pounds);
 /// ```
 #[derive(Copy, Clone, Debug)]
-pub struct Weight {
+pub struct Mass {
     kilograms: f64,
 }
 
-impl Weight {
+impl Mass {
     // Inputs, metric
     pub fn from_kilograms(kilograms: f64) -> Self {
-        Weight { kilograms: kilograms }
+        Mass { kilograms: kilograms }
     }
 
     pub fn from_micrograms(micrograms: f64) -> Self {
@@ -50,8 +50,8 @@ impl Weight {
         Self::from_kilograms(grains / 15432.358)
     }
 
-    pub fn from_pennyweights(pennyweights: f64) -> Self {
-        Self::from_kilograms(pennyweights / 643.01493)
+    pub fn from_pennymasss(pennymasss: f64) -> Self {
+        Self::from_kilograms(pennymasss / 643.01493)
     }
 
     pub fn from_ounces(ounces: f64) -> Self {
@@ -112,7 +112,7 @@ impl Weight {
         self.kilograms * 15432.358
     }
 
-    pub fn as_pennyweights(&self) -> f64 {
+    pub fn as_pennymasss(&self) -> f64 {
         self.kilograms * 643.01493
     }
 
@@ -145,7 +145,7 @@ impl Weight {
     }
 }
 
-impl Measurement for Weight {
+impl Measurement for Mass {
     fn get_base_units(&self) -> f64 {
         self.kilograms
     }
@@ -174,4 +174,4 @@ impl Measurement for Weight {
     }
 }
 
-implement_measurement! { Weight }
+implement_measurement! { Mass }

src/tests/weight_tests.rs renamed to src/tests/mass_tests.rs

@@ -1,175 +1,175 @@
-use weight::*;
+use mass::*;
 use super::assert_almost_eq;
 
-// Weight Units
+// Mass Units
 // Metric
 #[test]
 fn kilograms() {
-    let t = Weight::from_kilograms(100.0);
+    let t = Mass::from_kilograms(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 100.0);
 }
 
 #[test]
 fn micrograms() {
-    let t = Weight::from_kilograms(100.0);
+    let t = Mass::from_kilograms(100.0);
     let o = t.as_micrograms();
     assert_almost_eq(o, 1e+11);
 
-    let t = Weight::from_micrograms(100.0);
+    let t = Mass::from_micrograms(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 1e-7);
 }
 
 #[test]
 fn milligrams() {
-    let t = Weight::from_kilograms(100.0);
+    let t = Mass::from_kilograms(100.0);
     let o = t.as_milligrams();
     assert_almost_eq(o, 1e+8);
 
-    let t = Weight::from_milligrams(100.0);
+    let t = Mass::from_milligrams(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 0.0001);
 }
 
 #[test]
 fn carats() {
-    let t = Weight::from_kilograms(100.0);
+    let t = Mass::from_kilograms(100.0);
     let o = t.as_carats();
     assert_almost_eq(o, 500000.0);
 
-    let t = Weight::from_carats(100.0);
+    let t = Mass::from_carats(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 0.02);
 }
 
 #[test]
 fn grams() {
-    let t = Weight::from_kilograms(100.0);
+    let t = Mass::from_kilograms(100.0);
     let o = t.as_grams();
     assert_almost_eq(o, 100000.0);
 
-    let t = Weight::from_grams(100.0);
+    let t = Mass::from_grams(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 0.1);
 }
 
 #[test]
 fn metric_tons() {
-    let t = Weight::from_kilograms(100.0);
+    let t = Mass::from_kilograms(100.0);
     let o = t.as_metric_tons();
     assert_almost_eq(o, 0.1);
 
-    let t = Weight::from_metric_tons(100.0);
+    let t = Mass::from_metric_tons(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 100000.0);
 }
 
 // Imperial
 #[test]
 fn grains() {
-    let t = Weight::from_kilograms(1.0);
+    let t = Mass::from_kilograms(1.0);
     let o = t.as_grains();
     assert_almost_eq(o, 15432.358);
 
-    let t = Weight::from_grains(100.0);
+    let t = Mass::from_grains(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 0.0064798911);
 }
 
 #[test]
-fn pennyweights() {
-    let t = Weight::from_kilograms(1.0);
-    let o = t.as_pennyweights();
+fn pennymasss() {
+    let t = Mass::from_kilograms(1.0);
+    let o = t.as_pennymasss();
     assert_almost_eq(o, 643.01493);
 
-    let t = Weight::from_pennyweights(100.0);
+    let t = Mass::from_pennymasss(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 0.15551738);
 }
 
 #[test]
 fn ounces() {
-    let t = Weight::from_kilograms(1.0);
+    let t = Mass::from_kilograms(1.0);
     let o = t.as_ounces();
     assert_almost_eq(o, 35.273962);
 
-    let t = Weight::from_ounces(100.0);
+    let t = Mass::from_ounces(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 2.8349523);
 }
 
 #[test]
 fn troy_ounces() {
-    let t = Weight::from_kilograms(1.0);
+    let t = Mass::from_kilograms(1.0);
     let o = t.as_troy_ounces();
     assert_almost_eq(o, 32.150747);
 
-    let t = Weight::from_troy_ounces(100.0);
+    let t = Mass::from_troy_ounces(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 3.1103476);
 }
 
 #[test]
 fn pounds() {
-    let t = Weight::from_kilograms(1.0);
+    let t = Mass::from_kilograms(1.0);
     let o = t.as_pounds();
     assert_almost_eq(o, 2.2046228);
 
-    let t = Weight::from_pounds(100.0);
+    let t = Mass::from_pounds(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 45.359233);
 }
 
 #[test]
 fn troy_pounds() {
-    let t = Weight::from_kilograms(1.0);
+    let t = Mass::from_kilograms(1.0);
     let o = t.as_troy_pounds();
     assert_almost_eq(o, 2.6792289);
 
-    let t = Weight::from_troy_pounds(100.0);
+    let t = Mass::from_troy_pounds(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 37.324172);
 }
 
 #[test]
 fn stones() {
-    let t = Weight::from_kilograms(100.0);
+    let t = Mass::from_kilograms(100.0);
     let o = t.as_stones();
     assert_almost_eq(o, 15.74730);
 
-    let t = Weight::from_stones(100.0);
+    let t = Mass::from_stones(100.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 635.02934);
 }
 
 #[test]
 fn short_tons() {
-    let t = Weight::from_kilograms(100.0);
+    let t = Mass::from_kilograms(100.0);
     let o = t.as_short_tons();
     assert_almost_eq(o, 0.11023113);
 
-    let t = Weight::from_short_tons(1.0);
+    let t = Mass::from_short_tons(1.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 907.18475);
 }
 
 #[test]
 fn long_tons() {
-    let t = Weight::from_kilograms(100.0);
+    let t = Mass::from_kilograms(100.0);
     let o = t.as_long_tons();
     assert_almost_eq(o, 0.098420653);
 
-    let t = Weight::from_long_tons(1.0);
+    let t = Mass::from_long_tons(1.0);
     let o = t.as_kilograms();
     assert_almost_eq(o, 1016.0469);
 }
 
 // Traits
 #[test]
 fn add() {
-    let a = Weight::from_kilograms(2.0);
-    let b = Weight::from_kilograms(4.0);
+    let a = Mass::from_kilograms(2.0);
+    let b = Mass::from_kilograms(4.0);
     let c = a + b;
     let d = b + a;
     assert_almost_eq(c.as_kilograms(), 6.0);
@@ -178,15 +178,15 @@ fn add() {
 
 #[test]
 fn sub() {
-    let a = Weight::from_kilograms(2.0);
-    let b = Weight::from_kilograms(4.0);
+    let a = Mass::from_kilograms(2.0);
+    let b = Mass::from_kilograms(4.0);
     let c = a - b;
     assert_almost_eq(c.as_kilograms(), -2.0);
 }
 
 #[test]
 fn mul() {
-    let a = Weight::from_kilograms(3.0);
+    let a = Mass::from_kilograms(3.0);
     let b = a * 2.0;
     let c = 2.0 * a;
     assert_almost_eq(b.as_kilograms(), 6.0);
@@ -195,8 +195,8 @@ fn mul() {
 
 #[test]
 fn div() {
-    let a = Weight::from_kilograms(2.0);
-    let b = Weight::from_kilograms(4.0);
+    let a = Mass::from_kilograms(2.0);
+    let b = Mass::from_kilograms(4.0);
     let c = a / b;
     let d = a / 2.0;
     assert_almost_eq(c, 0.5);
@@ -205,22 +205,22 @@ fn div() {
 
 #[test]
 fn eq() {
-    let a = Weight::from_kilograms(2.0);
-    let b = Weight::from_kilograms(2.0);
+    let a = Mass::from_kilograms(2.0);
+    let b = Mass::from_kilograms(2.0);
     assert_eq!(a == b, true);
 }
 
 #[test]
 fn neq() {
-    let a = Weight::from_kilograms(2.0);
-    let b = Weight::from_kilograms(4.0);
+    let a = Mass::from_kilograms(2.0);
+    let b = Mass::from_kilograms(4.0);
     assert_eq!(a == b, false);
 }
 
 #[test]
 fn cmp() {
-    let a = Weight::from_kilograms(2.0);
-    let b = Weight::from_kilograms(4.0);
+    let a = Mass::from_kilograms(2.0);
+    let b = Mass::from_kilograms(4.0);
     assert_eq!(a < b, true);
     assert_eq!(a <= b, true);
     assert_eq!(a > b, false);

src/tests/mod.rs

@@ -1,6 +1,6 @@
 mod length_tests;
 mod temperature_tests;
-mod weight_tests;
+mod mass_tests;
 mod volume_tests;
 mod speed_tests;
 mod acceleration_tests;