max/easee-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Report back failing string on parse error

Browse Source
This commit is contained in:
Maxime Augier 2024-08-19 20:27:47 +02:00
parent 6b6df9eaca
commit 7f93f2d0b7
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/observation.rs
View File

@ -73,19 +73,22 @@ pub enum ObservationData {
#[derive(Error, Debug)] #[derive(Error, Debug)]
pub enum ParseError { pub enum ParseError {
#[error("integer: {0}")] #[error("integer `{0}`: {1}")]
Integer(#[from] ParseIntError), Integer(String, ParseIntError),
#[error("double: {0}")] #[error("double `{0}: {1}")]
Double(#[from] ParseFloatError), Double(String, ParseFloatError),
} }
impl ObservationData { impl ObservationData {
fn from_dynamic(value: String, data_type: DataType) -> Result<ObservationData, ParseError> { fn from_dynamic(value: String, data_type: DataType) -> Result<ObservationData, ParseError> {
Ok(match data_type { Ok(match data_type {
DataType::Boolean => ObservationData::Boolean(value.parse::<i64>()? != 0), DataType::Boolean => ObservationData::Boolean(value.parse::<i64>()
DataType::Double => ObservationData::Double(value.parse()?), .map_err(move |e| ParseError::Integer(value, e))? != 0),
DataType::Integer => ObservationData::Integer(value.parse()?), DataType::Double => ObservationData::Double(value.parse()
.map_err(move|e| ParseError::Double(value, e))?),
DataType::Integer => ObservationData::Integer(value.parse()
.map_err(move |e| ParseError::Integer(value, e))?),
DataType::String => ObservationData::String(value), DataType::String => ObservationData::String(value),
}) })
} }