diff --git a/src/metar.rs b/src/metar.rs index 4ef7604..6c29712 100644 --- a/src/metar.rs +++ b/src/metar.rs @@ -1,5 +1,4 @@ use crate::{Config, Position}; -use chrono::format; use chrono::DateTime; use chrono::FixedOffset; use chrono::TimeDelta; @@ -354,6 +353,8 @@ fn is_exact_match(station: &str, config: &Config) -> bool { mod tests { use std::str::FromStr; + use units::{AltitudeUnit, DistanceUnit}; + use super::*; #[test] diff --git a/src/metar/wxcodes.rs b/src/metar/wxcodes.rs index 5b7130b..420c371 100644 --- a/src/metar/wxcodes.rs +++ b/src/metar/wxcodes.rs @@ -333,7 +333,7 @@ mod tests { use std::str::FromStr; use super::{get_wxcodes_from_json, WxCode, WxCodeIntensity}; - use crate::metar::{wxcode_from_str, MetarField, WxCodeProximity}; + use crate::metar::{MetarField, WxCodeProximity}; #[test] fn test_get_regex() { @@ -371,13 +371,8 @@ mod tests { #[test] fn test_wxcode_from_str() { - let expected: MetarField = MetarField::WxCode( - WxCode::Ra, - WxCodeIntensity::Light, - WxCodeProximity::OnStation, - crate::metar::WxCodeDescription::None, - ); - let actual = wxcode_from_str("-RA"); - assert_eq!(Some(expected), actual); + let expected = WxCode::Ra; + let actual = WxCode::from_str("-RA").unwrap(); + assert_eq!(expected, actual); } }