Align member implementation order with trait

This resolves "Different impl member order from the trait" warnings
in JetBrains IDE's Rust plugin.

Author: sunsided

src/acceleration.rs

@@ -69,17 +69,17 @@ impl Acceleration {
 }
 
 impl Measurement for Acceleration {
+    fn get_base_units_name(&self) -> &'static str {
+        "m/s\u{00B2}"
+    }
+
     fn as_base_units(&self) -> f64 {
         self.meters_per_second_per_second
     }
 
     fn from_base_units(units: f64) -> Self {
         Self::from_meters_per_second_per_second(units)
     }
-
-    fn get_base_units_name(&self) -> &'static str {
-        "m/s\u{00B2}"
-    }
 }
 
 #[cfg(feature = "from_str")]

src/angle.rs

@@ -90,17 +90,17 @@ impl Angle {
 }
 
 impl Measurement for Angle {
+    fn get_base_units_name(&self) -> &'static str {
+        "rad"
+    }
+
     fn as_base_units(&self) -> f64 {
         self.radians
     }
 
     fn from_base_units(units: f64) -> Self {
         Self::from_radians(units)
     }
-
-    fn get_base_units_name(&self) -> &'static str {
-        "rad"
-    }
 }
 
 #[cfg(feature = "from_str")]

src/angular_velocity.rs

@@ -58,17 +58,17 @@ impl AngularVelocity {
 }
 
 impl Measurement for AngularVelocity {
+    fn get_base_units_name(&self) -> &'static str {
+        "rad/s"
+    }
+
     fn as_base_units(&self) -> f64 {
         self.radians_per_second
     }
 
     fn from_base_units(units: f64) -> Self {
         Self::from_radians_per_second(units)
     }
-
-    fn get_base_units_name(&self) -> &'static str {
-        "rad/s"
-    }
 }
 
 #[cfg(feature = "from_str")]

src/area.rs

@@ -277,18 +277,6 @@ impl Area {
 }
 
 impl Measurement for Area {
-    fn as_base_units(&self) -> f64 {
-        self.square_meters
-    }
-
-    fn from_base_units(units: f64) -> Self {
-        Self::from_square_meters(units)
-    }
-
-    fn get_base_units_name(&self) -> &'static str {
-        "m\u{00B2}"
-    }
-
     fn get_appropriate_units(&self) -> (&'static str, f64) {
         // Smallest to largest
         let list = [
@@ -303,6 +291,18 @@ impl Measurement for Area {
         ];
         self.pick_appropriate_units(&list)
     }
+
+    fn get_base_units_name(&self) -> &'static str {
+        "m\u{00B2}"
+    }
+
+    fn as_base_units(&self) -> f64 {
+        self.square_meters
+    }
+
+    fn from_base_units(units: f64) -> Self {
+        Self::from_square_meters(units)
+    }
 }
 
 #[cfg(feature = "from_str")]

src/current.rs

@@ -64,18 +64,6 @@ impl Current {
 }
 
 impl Measurement for Current {
-    fn as_base_units(&self) -> f64 {
-        self.amperes
-    }
-
-    fn from_base_units(units: f64) -> Self {
-        Self::from_amperes(units)
-    }
-
-    fn get_base_units_name(&self) -> &'static str {
-        "A"
-    }
-
     fn get_appropriate_units(&self) -> (&'static str, f64) {
         // Smallest to Largest
         let list = [
@@ -94,6 +82,18 @@ impl Measurement for Current {
         ];
         self.pick_appropriate_units(&list)
     }
+
+    fn get_base_units_name(&self) -> &'static str {
+        "A"
+    }
+
+    fn as_base_units(&self) -> f64 {
+        self.amperes
+    }
+
+    fn from_base_units(units: f64) -> Self {
+        Self::from_amperes(units)
+    }
 }
 
 implement_measurement! { Current }

src/data.rs

@@ -139,18 +139,6 @@ impl Data {
 }
 
 impl Measurement for Data {
-    fn as_base_units(&self) -> f64 {
-        self.octets
-    }
-
-    fn from_base_units(units: f64) -> Self {
-        Self::from_octets(units)
-    }
-
-    fn get_base_units_name(&self) -> &'static str {
-        "octets"
-    }
-
     fn get_appropriate_units(&self) -> (&'static str, f64) {
         // Smallest to largest
         let list = [
@@ -164,6 +152,18 @@ impl Measurement for Data {
         ];
         self.pick_appropriate_units(&list)
     }
+
+    fn get_base_units_name(&self) -> &'static str {
+        "octets"
+    }
+
+    fn as_base_units(&self) -> f64 {
+        self.octets
+    }
+
+    fn from_base_units(units: f64) -> Self {
+        Self::from_octets(units)
+    }
 }
 
 implement_measurement! { Data }

src/density.rs

@@ -110,17 +110,17 @@ impl ::std::ops::Mul<Volume> for Density {
 }
 
 impl Measurement for Density {
+    fn get_base_units_name(&self) -> &'static str {
+        "kg/m\u{00B3}"
+    }
+
     fn as_base_units(&self) -> f64 {
         self.kilograms_per_cubic_meter
     }
 
     fn from_base_units(units: f64) -> Self {
         Self::from_kilograms_per_cubic_meter(units)
     }
-
-    fn get_base_units_name(&self) -> &'static str {
-        "kg/m\u{00B3}"
-    }
 }
 
 implement_measurement! { Density }

src/energy.rs

@@ -82,18 +82,6 @@ impl Energy {
 }
 
 impl Measurement for Energy {
-    fn as_base_units(&self) -> f64 {
-        self.joules
-    }
-
-    fn from_base_units(units: f64) -> Self {
-        Self::from_joules(units)
-    }
-
-    fn get_base_units_name(&self) -> &'static str {
-        "J"
-    }
-
     fn get_appropriate_units(&self) -> (&'static str, f64) {
         // Smallest to Largest
         let list = [
@@ -112,6 +100,18 @@ impl Measurement for Energy {
         ];
         self.pick_appropriate_units(&list)
     }
+
+    fn get_base_units_name(&self) -> &'static str {
+        "J"
+    }
+
+    fn as_base_units(&self) -> f64 {
+        self.joules
+    }
+
+    fn from_base_units(units: f64) -> Self {
+        Self::from_joules(units)
+    }
 }
 
 implement_measurement! { Energy }

src/force.rs

@@ -107,18 +107,6 @@ impl Force {
 }
 
 impl Measurement for Force {
-    fn as_base_units(&self) -> f64 {
-        self.newtons
-    }
-
-    fn from_base_units(units: f64) -> Self {
-        Self::from_newtons(units)
-    }
-
-    fn get_base_units_name(&self) -> &'static str {
-        "N"
-    }
-
     fn get_appropriate_units(&self) -> (&'static str, f64) {
         // Smallest to largest
         let list = [
@@ -133,6 +121,18 @@ impl Measurement for Force {
         ];
         self.pick_appropriate_units(&list)
     }
+
+    fn get_base_units_name(&self) -> &'static str {
+        "N"
+    }
+
+    fn as_base_units(&self) -> f64 {
+        self.newtons
+    }
+
+    fn from_base_units(units: f64) -> Self {
+        Self::from_newtons(units)
+    }
 }
 
 implement_measurement! { Force }

src/frequency.rs

@@ -131,18 +131,6 @@ impl Frequency {
 }
 
 impl Measurement for Frequency {
-    fn as_base_units(&self) -> f64 {
-        self.hertz
-    }
-
-    fn from_base_units(units: f64) -> Self {
-        Self::from_hertz(units)
-    }
-
-    fn get_base_units_name(&self) -> &'static str {
-        "Hz"
-    }
-
     fn get_appropriate_units(&self) -> (&'static str, f64) {
         // Smallest to largest
         let list = [
@@ -157,6 +145,18 @@ impl Measurement for Frequency {
         ];
         self.pick_appropriate_units(&list)
     }
+
+    fn get_base_units_name(&self) -> &'static str {
+        "Hz"
+    }
+
+    fn as_base_units(&self) -> f64 {
+        self.hertz
+    }
+
+    fn from_base_units(units: f64) -> Self {
+        Self::from_hertz(units)
+    }
 }
 
 implement_measurement! { Frequency }