Merge pull request #214 from bheisler/master

Add singular and plural units to from_str impl. #212
iliekturtles · Oct 22, 2020 · 6f5fbbc · 6f5fbbc
2 parents 9cacb9b + 916e2ad
commit 6f5fbbc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/quantity.rs b/src/quantity.rs
@@ -508,11 +508,12 @@ macro_rules! quantity {
                     fn from_str(s: &str) -> Result<Self, Self::Err> {
                         let mut parts = s.splitn(2, ' ');
                         let value = parts.next().unwrap();
-                        let abbr = parts.next().ok_or(NoSeparator)?;
+                        let unit = parts.next().ok_or(NoSeparator)?;
                         let value = value.parse::<V>().map_err(|_| ValueParseError)?;
 
-                        match abbr.trim() {
-                            $($abbreviation => Ok(Self::new::<super::super::$unit>(value)),)+
+                        #[allow(unreachable_patterns)]
+                        match unit.trim() {
+                            $($abbreviation | $singular | $plural => Ok(Self::new::<super::super::$unit>(value)),)+
                             _ => Err(UnknownUnit),
                         }
                     }

diff --git a/src/tests/quantity.rs b/src/tests/quantity.rs
@@ -38,6 +38,8 @@ storage_types! {
         let m2 = k::Mass::new::<kilogram>(V::from_f64(1.0E-3).unwrap());
 
         Test::assert_eq(&"1 m".parse::<k::Length>().unwrap(), &l1);
+        Test::assert_eq(&"1 meter".parse::<k::Length>().unwrap(), &l1);
+        Test::assert_eq(&"1 meters".parse::<k::Length>().unwrap(), &l1);
         Test::assert_eq(&"1.0 km".parse::<k::Length>().unwrap(), &l2);
         Test::assert_eq(&"1000 kg".parse::<k::Mass>().unwrap(), &m1);
         Test::assert_eq(&"1.0E-3 kg".parse::<k::Mass>().unwrap(), &m2);