fix: used American spellings throughout

Author: AliAlimohammadi

src/conversions/speed.rs

@@ -14,10 +14,10 @@ use std::fmt;
 /// Supported speed units
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum SpeedUnit {
-    /// Kilometres per hour (km/h)
-    KilometresPerHour,
-    /// Metres per second (m/s) - SI derived unit
-    MetresPerSecond,
+    /// Kilometers per hour (km/h)
+    KilometersPerHour,
+    /// Meters per second (m/s) - SI derived unit
+    MetersPerSecond,
     /// Miles per hour (mph)
     MilesPerHour,
     /// Nautical miles per hour (knot)
@@ -33,8 +33,8 @@ pub enum SpeedUnit {
 impl fmt::Display for SpeedUnit {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            SpeedUnit::KilometresPerHour => write!(f, "km/h"),
-            SpeedUnit::MetresPerSecond => write!(f, "m/s"),
+            SpeedUnit::KilometersPerHour => write!(f, "km/h"),
+            SpeedUnit::MetersPerSecond => write!(f, "m/s"),
             SpeedUnit::MilesPerHour => write!(f, "mph"),
             SpeedUnit::Knot => write!(f, "knot"),
             SpeedUnit::FeetPerSecond => write!(f, "ft/s"),
@@ -48,8 +48,8 @@ impl SpeedUnit {
     /// Get the conversion factor to km/h
     fn as_kmh_multiplier(self) -> f64 {
         match self {
-            SpeedUnit::KilometresPerHour => 1.0,
-            SpeedUnit::MetresPerSecond => 3.6,
+            SpeedUnit::KilometersPerHour => 1.0,
+            SpeedUnit::MetersPerSecond => 3.6,
             SpeedUnit::MilesPerHour => 1.609344,
             SpeedUnit::Knot => 1.852,
             SpeedUnit::FeetPerSecond => 1.09728,
@@ -61,8 +61,8 @@ impl SpeedUnit {
     /// Get the conversion factor from km/h to this unit
     fn kmh_multiplier(self) -> f64 {
         match self {
-            SpeedUnit::KilometresPerHour => 1.0,
-            SpeedUnit::MetresPerSecond => 0.277777778,
+            SpeedUnit::KilometersPerHour => 1.0,
+            SpeedUnit::MetersPerSecond => 0.277777778,
             SpeedUnit::MilesPerHour => 0.621371192,
             SpeedUnit::Knot => 0.539956803,
             SpeedUnit::FeetPerSecond => 0.911344415,
@@ -98,72 +98,72 @@ mod tests {
         assert_eq!(
             convert_speed(
                 100.0,
-                SpeedUnit::KilometresPerHour,
-                SpeedUnit::MetresPerSecond
+                SpeedUnit::KilometersPerHour,
+                SpeedUnit::MetersPerSecond
             ),
             27.778
         );
         assert_eq!(
-            convert_speed(100.0, SpeedUnit::KilometresPerHour, SpeedUnit::MilesPerHour),
+            convert_speed(100.0, SpeedUnit::KilometersPerHour, SpeedUnit::MilesPerHour),
             62.137
         );
         assert_eq!(
-            convert_speed(100.0, SpeedUnit::KilometresPerHour, SpeedUnit::Knot),
+            convert_speed(100.0, SpeedUnit::KilometersPerHour, SpeedUnit::Knot),
             53.996
         );
         assert_eq!(
             convert_speed(
                 100.0,
-                SpeedUnit::MetresPerSecond,
-                SpeedUnit::KilometresPerHour
+                SpeedUnit::MetersPerSecond,
+                SpeedUnit::KilometersPerHour
             ),
             360.0
         );
         assert_eq!(
-            convert_speed(100.0, SpeedUnit::MetresPerSecond, SpeedUnit::MilesPerHour),
+            convert_speed(100.0, SpeedUnit::MetersPerSecond, SpeedUnit::MilesPerHour),
             223.694
         );
         assert_eq!(
-            convert_speed(100.0, SpeedUnit::MetresPerSecond, SpeedUnit::Knot),
+            convert_speed(100.0, SpeedUnit::MetersPerSecond, SpeedUnit::Knot),
             194.384
         );
         assert_eq!(
-            convert_speed(100.0, SpeedUnit::MilesPerHour, SpeedUnit::KilometresPerHour),
+            convert_speed(100.0, SpeedUnit::MilesPerHour, SpeedUnit::KilometersPerHour),
             160.934
         );
         assert_eq!(
-            convert_speed(100.0, SpeedUnit::MilesPerHour, SpeedUnit::MetresPerSecond),
+            convert_speed(100.0, SpeedUnit::MilesPerHour, SpeedUnit::MetersPerSecond),
             44.704
         );
         assert_eq!(
             convert_speed(100.0, SpeedUnit::MilesPerHour, SpeedUnit::Knot),
             86.898
         );
         assert_eq!(
-            convert_speed(100.0, SpeedUnit::Knot, SpeedUnit::KilometresPerHour),
+            convert_speed(100.0, SpeedUnit::Knot, SpeedUnit::KilometersPerHour),
             185.2
         );
         assert_eq!(
-            convert_speed(100.0, SpeedUnit::Knot, SpeedUnit::MetresPerSecond),
+            convert_speed(100.0, SpeedUnit::Knot, SpeedUnit::MetersPerSecond),
             51.444
         );
         assert_eq!(
             convert_speed(100.0, SpeedUnit::Knot, SpeedUnit::MilesPerHour),
             115.078
         );
         assert_eq!(
-            convert_speed(100.0, SpeedUnit::FeetPerSecond, SpeedUnit::MetresPerSecond),
+            convert_speed(100.0, SpeedUnit::FeetPerSecond, SpeedUnit::MetersPerSecond),
             30.48
         );
         assert_eq!(
-            convert_speed(100.0, SpeedUnit::MetresPerSecond, SpeedUnit::FeetPerSecond),
+            convert_speed(100.0, SpeedUnit::MetersPerSecond, SpeedUnit::FeetPerSecond),
             328.084
         );
         assert_eq!(
             convert_speed(
                 100.0,
                 SpeedUnit::FeetPerSecond,
-                SpeedUnit::KilometresPerHour
+                SpeedUnit::KilometersPerHour
             ),
             109.728
         );
@@ -172,48 +172,59 @@ mod tests {
             68.182
         );
         assert_eq!(
-            convert_speed(1.0, SpeedUnit::Mach, SpeedUnit::KilometresPerHour),
+            convert_speed(1.0, SpeedUnit::Mach, SpeedUnit::KilometersPerHour),
             1225.08
         );
         assert_eq!(
-            convert_speed(1.0, SpeedUnit::Mach, SpeedUnit::MetresPerSecond),
+            convert_speed(1.0, SpeedUnit::Mach, SpeedUnit::MetersPerSecond),
             340.3
         );
         assert_eq!(
-            convert_speed(1000.0, SpeedUnit::KilometresPerHour, SpeedUnit::Mach),
+            convert_speed(1000.0, SpeedUnit::KilometersPerHour, SpeedUnit::Mach),
             0.816
         );
         assert_eq!(
-            convert_speed(2.0, SpeedUnit::Mach, SpeedUnit::KilometresPerHour),
+            convert_speed(2.0, SpeedUnit::Mach, SpeedUnit::KilometersPerHour),
             2450.16
         );
         assert_eq!(
-            convert_speed(1.0, SpeedUnit::SpeedOfLight, SpeedUnit::MetresPerSecond),
+            convert_speed(1.0, SpeedUnit::SpeedOfLight, SpeedUnit::MetersPerSecond),
             299792458.24
         );
         assert_eq!(
-            convert_speed(1.0, SpeedUnit::SpeedOfLight, SpeedUnit::KilometresPerHour),
+            convert_speed(1.0, SpeedUnit::SpeedOfLight, SpeedUnit::KilometersPerHour),
             1079252848.8
         );
         assert_eq!(
             convert_speed(
                 299792458.0,
-                SpeedUnit::MetresPerSecond,
+                SpeedUnit::MetersPerSecond,
                 SpeedUnit::SpeedOfLight
             ),
             1.0
         );
         assert_eq!(
-            convert_speed(0.1, SpeedUnit::SpeedOfLight, SpeedUnit::MetresPerSecond),
+            convert_speed(0.1, SpeedUnit::SpeedOfLight, SpeedUnit::MetersPerSecond),
             29979245.824
         );
         assert_eq!(
             convert_speed(
                 100.0,
-                SpeedUnit::KilometresPerHour,
-                SpeedUnit::KilometresPerHour
+                SpeedUnit::KilometersPerHour,
+                SpeedUnit::KilometersPerHour
             ),
             100.0
         );
     }
+
+    #[test]
+    fn test_display() {
+        assert_eq!(SpeedUnit::KilometersPerHour.to_string(), "km/h");
+        assert_eq!(SpeedUnit::MetersPerSecond.to_string(), "m/s");
+        assert_eq!(SpeedUnit::MilesPerHour.to_string(), "mph");
+        assert_eq!(SpeedUnit::Knot.to_string(), "knot");
+        assert_eq!(SpeedUnit::FeetPerSecond.to_string(), "ft/s");
+        assert_eq!(SpeedUnit::Mach.to_string(), "Mach");
+        assert_eq!(SpeedUnit::SpeedOfLight.to_string(), "c");
+    }
 }