WIP

src/input.rs

@@ -28,32 +28,32 @@ pub struct Input {
     pub hot_water_source: HotWaterSource,
     pub shower: Option<Shower>,
     pub bath: Option<Bath>,
-    #[serde(rename(deserialize = "Other"))]
+    #[serde(rename = "Other")]
     pub other_water_use: Option<OtherWaterUse>,
-    #[serde(rename(deserialize = "Distribution"))]
+    #[serde(rename = "Distribution")]
     pub water_distribution: Option<WaterDistribution>,
-    #[serde(rename(deserialize = "Events"))]
+    #[serde(rename = "Events")]
     pub water_heating_events: WaterHeatingEvents,
     pub space_heat_system: Option<SpaceHeatSystem>,
     pub space_cool_system: Option<SpaceCoolSystem>,
     pub ventilation: Option<Ventilation>,
     pub infiltration: Infiltration,
     pub zone: ZoneDictionary,
-    #[serde(rename(deserialize = "PartGcompliance"))]
+    #[serde(rename = "PartGcompliance")]
     part_g_compliance: Option<bool>,
-    #[serde(rename(deserialize = "PartO_active_cooling_required"))]
+    #[serde(rename = "PartO_active_cooling_required")]
     part_o_active_cooling_required: Option<bool>,
     ground_floor_area: Option<f64>,
     number_of_bedrooms: Option<u32>,
     number_of_wet_rooms: Option<u32>,
     heating_control_type: Option<HeatingControlType>,
-    #[serde(rename(deserialize = "WaterHeatSchedDefault"))]
+    #[serde(rename = "WaterHeatSchedDefault")]
     default_water_heating_schedule: Option<WaterHeatingSchedule>,
     pub heat_source_wet: Option<HeatSourceWet>,
-    #[serde(rename(deserialize = "WWHRS"))]
+    #[serde(rename = "WWHRS")]
     pub waste_water_heat_recovery: Option<WasteWaterHeatRecovery>,
     pub on_site_generation: Option<OnSiteGeneration>,
-    #[serde(rename(deserialize = "Window_Opening_For_Cooling"))]
+    #[serde(rename = "Window_Opening_For_Cooling")]
     pub window_opening_for_cooling: Option<WindowOpeningForCooling>,
 }
 
@@ -142,7 +142,7 @@ pub struct EnergySupplyInput {
     pub mains_electricity: Option<EnergySupplyDetails>,
     #[serde(alias = "mains gas")]
     pub mains_gas: Option<EnergySupplyDetails>,
-    #[serde(rename(deserialize = "bulk LPG"))]
+    #[serde(rename = "bulk LPG")]
     pub bulk_lpg: Option<EnergySupplyDetails>,
     #[serde(alias = "heat network")]
     pub heat_network: Option<HeatNetwork>,
@@ -153,7 +153,7 @@ pub struct EnergySupplyInput {
 pub struct EnergySupplyDetails {
     pub fuel: EnergySupplyType,
     pub diverter: Option<EnergyDiverter>,
-    #[serde(rename(deserialize = "ElectricBattery"))]
+    #[serde(rename = "ElectricBattery")]
     pub electric_battery: Option<ElectricBattery>,
 }
 
@@ -163,17 +163,17 @@ pub enum EnergySupplyType {
     Electricity,
     #[serde(alias = "mains_gas", alias = "mains gas")]
     MainsGas,
-    #[serde(rename(deserialize = "unmet_demand"))]
+    #[serde(rename = "unmet_demand")]
     UnmetDemand,
-    #[serde(rename(deserialize = "custom"))]
+    #[serde(rename = "custom")]
     Custom,
     #[serde(alias = "bulk LPG", alias = "LPG_bulk")]
     LpgBulk,
-    #[serde(rename(deserialize = "LPG_bottled"))]
+    #[serde(rename = "LPG_bottled")]
     LpgBottled,
-    #[serde(rename(deserialize = "LPG_condition_11F"))]
+    #[serde(rename = "LPG_condition_11F")]
     LpgCondition11F,
-    #[serde(rename(deserialize = "heat network"))]
+    #[serde(rename = "heat network")]
     HeatNetwork,
 }
 
@@ -196,7 +196,7 @@ impl Default for EnergyDiverter {
 
 #[derive(Clone, Debug, Deserialize)]
 pub enum StorageTankType {
-    #[serde(rename(deserialize = "hw cylinder"))]
+    #[serde(rename = "hw cylinder")]
     HotWaterCylinder,
 }
 
@@ -211,7 +211,7 @@ impl StorageTankType {
 
 #[derive(Clone, Debug, Deserialize)]
 pub enum DiverterHeatSourceType {
-    #[serde(rename(deserialize = "immersion"))]
+    #[serde(rename = "immersion")]
     Immersion,
 }
 
@@ -299,15 +299,15 @@ where
 #[derive(Debug, Deserialize)]
 #[serde(tag = "type", deny_unknown_fields)]
 pub enum ControlDetails {
-    #[serde[rename(deserialize = "OnOffTimeControl")]]
+    #[serde(rename = "OnOffTimeControl")]
     OnOffTime {
         start_day: u32,
         time_series_step: f64,
         advanced_start: Option<u32>,
         logic_type: Option<ControlLogicType>,
         schedule: Schedule,
     },
-    #[serde[rename(deserialize = "OnOffCostMinimisingTimeControl")]]
+    #[serde(rename = "OnOffCostMinimisingTimeControl")]
     OnOffCostMinimisingTime {
         start_day: u32,
         time_series_step: f64,
@@ -316,7 +316,7 @@ pub enum ControlDetails {
         time_on_daily: Option<f64>,
         schedule: Schedule,
     },
-    #[serde[rename(deserialize = "SetpointTimeControl")]]
+    #[serde(rename = "SetpointTimeControl")]
     SetpointTime {
         start_day: u32,
         time_series_step: f64,
@@ -327,7 +327,7 @@ pub enum ControlDetails {
         default_to_max: Option<bool>,
         schedule: Schedule,
     },
-    #[serde[rename(deserialize = "ToUChargeControl")]]
+    #[serde(rename = "ToUChargeControl")]
     ToUCharge {
         start_day: u32,
         time_series_step: f64,
@@ -347,7 +347,7 @@ pub enum ControlLogicType {
 #[derive(Debug, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct HotWaterSource {
-    #[serde[rename(deserialize = "hw cylinder")]]
+    #[serde(rename = "hw cylinder")]
     pub hot_water_cylinder: HotWaterSourceDetails,
 }
 
@@ -371,46 +371,46 @@ pub enum HotWaterSourceDetails {
         daily_losses: f64,
         min_temp: f64,
         setpoint_temp: f64,
-        #[serde(rename(deserialize = "Control_hold_at_setpnt"))]
+        #[serde(rename = "Control_hold_at_setpnt")]
         control_hold_at_setpoint: Option<String>,
-        #[serde(rename(deserialize = "ColdWaterSource"))]
+        #[serde(rename = "ColdWaterSource")]
         cold_water_source: ColdWaterSourceType,
-        #[serde(rename(deserialize = "HeatSource"))]
+        #[serde(rename = "HeatSource")]
         heat_source: HashMap<String, HeatSource>,
         primary_pipework: Option<WaterPipework>,
     },
     CombiBoiler {
-        #[serde(rename(deserialize = "ColdWaterSource"))]
+        #[serde(rename = "ColdWaterSource")]
         cold_water_source: ColdWaterSourceType,
-        #[serde(rename(deserialize = "HeatSourceWet"))]
+        #[serde(rename = "HeatSourceWet")]
         heat_source_wet: HeatSourceWetType,
         #[serde(alias = "Control")]
         control: HeatSourceControlType,
-        #[serde(rename(deserialize = "separate_DHW_tests"))]
+        #[serde(rename = "separate_DHW_tests")]
         separate_dhw_tests: BoilerHotWaterTest,
         rejected_energy_1: f64,
         fuel_energy_2: f64,
         rejected_energy_2: f64,
         storage_loss_factor_2: f64,
         rejected_factor_3: f64,
-        #[serde(rename(deserialize = "daily_HW_usage"))]
+        #[serde(rename = "daily_HW_usage")]
         daily_hot_water_usage: f64,
     },
     #[serde(rename(deserialize = "HIU"))]
     Hiu {
-        #[serde(rename(deserialize = "ColdWaterSource"))]
+        #[serde(rename = "ColdWaterSource")]
         cold_water_source: ColdWaterSourceType,
-        #[serde(rename(deserialize = "HeatSourceWet"))]
+        #[serde(rename = "HeatSourceWet")]
         heat_source_wet: HeatSourceWetType,
         #[serde(alias = "Control")]
         control: HeatSourceControlType,
     },
     PointOfUse {
         power: f64,
         efficiency: f64,
-        #[serde[rename(deserialize = "EnergySupply")]]
+        #[serde(rename = "EnergySupply")]
         energy_supply: EnergySupplyType,
-        #[serde(rename(deserialize = "ColdWaterSource"))]
+        #[serde(rename = "ColdWaterSource")]
         cold_water_source: ColdWaterSourceType,
     },
     HeatBattery {
@@ -420,9 +420,9 @@ pub enum HotWaterSourceDetails {
 
 #[derive(Copy, Clone, Debug, Deserialize)]
 pub enum ColdWaterSourceType {
-    #[serde(rename(deserialize = "mains water"))]
+    #[serde(rename = "mains water")]
     MainsWater,
-    #[serde(rename(deserialize = "header tank"))]
+    #[serde(rename = "header tank")]
     HeaderTank,
 }