Add support for US cups
This commit is contained in:
parent
5555d0712e
commit
1c3315d19d
4 changed files with 19 additions and 0 deletions
|
@ -123,6 +123,11 @@ fn get_conversion(unit: NonMetric) -> Conversion {
|
||||||
from: imperial_gallon_from,
|
from: imperial_gallon_from,
|
||||||
to: MetricQuantity { amount: imperial_gallon_to, unit: Metric::Litre },
|
to: MetricQuantity { amount: imperial_gallon_to, unit: Metric::Litre },
|
||||||
},
|
},
|
||||||
|
NonMetric::USCup => Conversion {
|
||||||
|
offset: 0.0,
|
||||||
|
from: 2.0 * 2.0 * 4.0 * us_gallon_from,
|
||||||
|
to: MetricQuantity { amount: us_gallon_to, unit: Metric::Litre },
|
||||||
|
},
|
||||||
NonMetric::USLiquidPint => Conversion {
|
NonMetric::USLiquidPint => Conversion {
|
||||||
offset: 0.0,
|
offset: 0.0,
|
||||||
from: 2.0 * 4.0 * us_gallon_from,
|
from: 2.0 * 4.0 * us_gallon_from,
|
||||||
|
@ -213,6 +218,7 @@ mod test {
|
||||||
Test(NonMetric::ImperialPint, 0.56826125),
|
Test(NonMetric::ImperialPint, 0.56826125),
|
||||||
Test(NonMetric::ImperialQuart, 1.1365225),
|
Test(NonMetric::ImperialQuart, 1.1365225),
|
||||||
Test(NonMetric::ImperialGallon, 4.54609),
|
Test(NonMetric::ImperialGallon, 4.54609),
|
||||||
|
Test(NonMetric::USCup, 0.2365882365),
|
||||||
Test(NonMetric::USLiquidPint, 0.473176473),
|
Test(NonMetric::USLiquidPint, 0.473176473),
|
||||||
Test(NonMetric::USLiquidQuart, 0.946352946),
|
Test(NonMetric::USLiquidQuart, 0.946352946),
|
||||||
Test(NonMetric::USGallon, 3.785411784),
|
Test(NonMetric::USGallon, 3.785411784),
|
||||||
|
|
|
@ -89,6 +89,7 @@ fn unit_to_name(unit: NonMetric) -> &'static str {
|
||||||
NonMetric::ImperialPint => "imperial pints",
|
NonMetric::ImperialPint => "imperial pints",
|
||||||
NonMetric::ImperialQuart => "imperial quarts",
|
NonMetric::ImperialQuart => "imperial quarts",
|
||||||
NonMetric::ImperialGallon => "imperial gallons",
|
NonMetric::ImperialGallon => "imperial gallons",
|
||||||
|
NonMetric::USCup => "US cups",
|
||||||
NonMetric::USLiquidPint => "US liquid pints",
|
NonMetric::USLiquidPint => "US liquid pints",
|
||||||
NonMetric::USLiquidQuart => "US liquid quarts",
|
NonMetric::USLiquidQuart => "US liquid quarts",
|
||||||
NonMetric::USGallon => "US gallons",
|
NonMetric::USGallon => "US gallons",
|
||||||
|
@ -138,6 +139,7 @@ mod test {
|
||||||
assert_eq!(run("1 imp pt"), Ok("5.683 dl".to_string()));
|
assert_eq!(run("1 imp pt"), Ok("5.683 dl".to_string()));
|
||||||
assert_eq!(run("1 imp qt"), Ok("1.137 l".to_string()));
|
assert_eq!(run("1 imp qt"), Ok("1.137 l".to_string()));
|
||||||
assert_eq!(run("1 imp gal"), Ok("4.546 l".to_string()));
|
assert_eq!(run("1 imp gal"), Ok("4.546 l".to_string()));
|
||||||
|
assert_eq!(run("1 US cup"), Ok("2.366 dl".to_string()));
|
||||||
assert_eq!(run("1 US pt"), Ok("4.732 dl".to_string()));
|
assert_eq!(run("1 US pt"), Ok("4.732 dl".to_string()));
|
||||||
assert_eq!(run("1 US qt"), Ok("9.464 dl".to_string()));
|
assert_eq!(run("1 US qt"), Ok("9.464 dl".to_string()));
|
||||||
assert_eq!(run("1 US gal"), Ok("3.785 l".to_string()));
|
assert_eq!(run("1 US gal"), Ok("3.785 l".to_string()));
|
||||||
|
|
10
src/parse.rs
10
src/parse.rs
|
@ -205,6 +205,11 @@ fn parse_unit(input: String) -> Result<NonMetric, ParseError> {
|
||||||
"imperial gallons" => Ok(NonMetric::ImperialGallon),
|
"imperial gallons" => Ok(NonMetric::ImperialGallon),
|
||||||
"imp gal" => Ok(NonMetric::ImperialGallon),
|
"imp gal" => Ok(NonMetric::ImperialGallon),
|
||||||
|
|
||||||
|
"US cup" => Ok(NonMetric::USCup),
|
||||||
|
"US cups" => Ok(NonMetric::USCup),
|
||||||
|
"us cup" => Ok(NonMetric::USCup),
|
||||||
|
"us cups" => Ok(NonMetric::USCup),
|
||||||
|
|
||||||
"US liquid pint" => Ok(NonMetric::USLiquidPint),
|
"US liquid pint" => Ok(NonMetric::USLiquidPint),
|
||||||
"US liquid pints" => Ok(NonMetric::USLiquidPint),
|
"US liquid pints" => Ok(NonMetric::USLiquidPint),
|
||||||
"US pint" => Ok(NonMetric::USLiquidPint),
|
"US pint" => Ok(NonMetric::USLiquidPint),
|
||||||
|
@ -490,6 +495,11 @@ mod test {
|
||||||
assert_eq!(parse_unit("imperial gallons".to_string()), Ok(NonMetric::ImperialGallon));
|
assert_eq!(parse_unit("imperial gallons".to_string()), Ok(NonMetric::ImperialGallon));
|
||||||
assert_eq!(parse_unit("imp gal".to_string()), Ok(NonMetric::ImperialGallon));
|
assert_eq!(parse_unit("imp gal".to_string()), Ok(NonMetric::ImperialGallon));
|
||||||
|
|
||||||
|
assert_eq!(parse_unit("US cup".to_string()), Ok(NonMetric::USCup));
|
||||||
|
assert_eq!(parse_unit("US cups".to_string()), Ok(NonMetric::USCup));
|
||||||
|
assert_eq!(parse_unit("us cup".to_string()), Ok(NonMetric::USCup));
|
||||||
|
assert_eq!(parse_unit("us cups".to_string()), Ok(NonMetric::USCup));
|
||||||
|
|
||||||
assert_eq!(parse_unit("US liquid pint".to_string()), Ok(NonMetric::USLiquidPint));
|
assert_eq!(parse_unit("US liquid pint".to_string()), Ok(NonMetric::USLiquidPint));
|
||||||
assert_eq!(parse_unit("US liquid pints".to_string()), Ok(NonMetric::USLiquidPint));
|
assert_eq!(parse_unit("US liquid pints".to_string()), Ok(NonMetric::USLiquidPint));
|
||||||
assert_eq!(parse_unit("US pint".to_string()), Ok(NonMetric::USLiquidPint));
|
assert_eq!(parse_unit("US pint".to_string()), Ok(NonMetric::USLiquidPint));
|
||||||
|
|
|
@ -34,6 +34,7 @@ pub enum NonMetric {
|
||||||
ImperialPint,
|
ImperialPint,
|
||||||
ImperialQuart,
|
ImperialQuart,
|
||||||
ImperialGallon,
|
ImperialGallon,
|
||||||
|
USCup,
|
||||||
USLiquidPint,
|
USLiquidPint,
|
||||||
USLiquidQuart,
|
USLiquidQuart,
|
||||||
USGallon,
|
USGallon,
|
||||||
|
|
Loading…
Reference in a new issue