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

Cargo fmt

Browse Source
This commit is contained in:
Maxime Augier 2024-11-25 13:37:32 +01:00
parent 0a5891b5be
commit 2266d7ecef
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/observation.rs
View File

@ -1,4 +1,7 @@
use serde::{de::{DeserializeOwned, IntoDeserializer}, Deserialize}; use serde::{
de::{DeserializeOwned, IntoDeserializer},
Deserialize,
};
use serde_repr::Deserialize_repr; use serde_repr::Deserialize_repr;
use std::num::{ParseFloatError, ParseIntError}; use std::num::{ParseFloatError, ParseIntError};
use thiserror::Error; use thiserror::Error;
@ -83,16 +86,16 @@ pub enum ParseError {
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( DataType::Boolean => ObservationData::Boolean(match &*value {
match &*value { "False" | "false" => false,
"False"|"false" => { false }, "True" | "true" => true,
"True"|"true" => { true } other => {
other => other other
.parse::<i64>() .parse::<i64>()
.map_err(move |e| ParseError::Integer(value, e))? .map_err(move |e| ParseError::Integer(value, e))?
!= 0, != 0
} }
), }),
DataType::Double => ObservationData::Double( DataType::Double => ObservationData::Double(
value value
.parse() .parse()
@ -226,7 +229,8 @@ fn op_mode_from_int(mode: i64) -> ChargerOpMode {
} }
fn deserialize_i64<T: DeserializeOwned>(value: i64) -> Option<T> { fn deserialize_i64<T: DeserializeOwned>(value: i64) -> Option<T> {
T::deserialize(<i64 as IntoDeserializer<serde::de::value::Error>>::into_deserializer(value)).ok() T::deserialize(<i64 as IntoDeserializer<serde::de::value::Error>>::into_deserializer(value))
.ok()
} }
impl Observation { impl Observation {