cleanup

Author: wuan

src/data/shelly/mod.rs

@@ -39,9 +39,9 @@ pub fn parse<'a, T: Deserialize<'a> + Clone>(msg: &'a Message) -> Result<T> {
     Ok(serde_json::from_slice::<T>(msg.payload())?)
 }
 
-type SwitchDataMapper = fn(data: &SwitchData) -> Option<WriteType>;
+type WriteTypeMapper<T> = fn(&T) -> Option<WriteType>;
 
-const SWITCH_FIELDS: &[(&str, SwitchDataMapper, &str)] = &[
+const SWITCH_FIELDS: &[(&str, WriteTypeMapper<SwitchData>, &str)] = &[
     (
         "output",
         |data: &SwitchData| Some(WriteType::Int(data.output as i32)),
@@ -74,8 +74,7 @@ const SWITCH_FIELDS: &[(&str, SwitchDataMapper, &str)] = &[
     ),
 ];
 
-type CoverDataMapper = fn(data: &CoverData) -> Option<WriteType>;
-const COVER_FIELDS: &[(&str, CoverDataMapper, &str)] = &[
+const COVER_FIELDS: &[(&str, WriteTypeMapper<CoverData>, &str)] = &[
     (
         "position",
         |data: &CoverData| data.position.map(WriteType::Int),
@@ -127,7 +126,7 @@ impl CheckMessage for ShellyLogger {
 fn handle_message<'a, T: Deserialize<'a> + Clone + Debug + Timestamped + Typenamed>(
     msg: &'a Message,
     txs: &Vec<SyncSender<WriteQuery>>,
-    fields: &[(&str, fn(&T) -> Option<WriteType>, &str)],
+    fields: &[(&str, WriteTypeMapper<T>, &str)],
 ) {
     let location = msg.topic().split("/").nth(1).unwrap();
     let channel = msg.topic().split(":").last().unwrap();