From 40bbd9a1df272eb8fe3136f5f37b1e48ecf52df7 Mon Sep 17 00:00:00 2001
From: Douglas Greenshields <douglas.greenshields@levellingup.gov.uk>
Date: Thu, 4 Apr 2024 12:19:32 +0100
Subject: [PATCH] use bool.then to simplify an expression

---
 src/external_conditions.rs | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/external_conditions.rs b/src/external_conditions.rs
index bcb9069..48946b1 100644
--- a/src/external_conditions.rs
+++ b/src/external_conditions.rs
@@ -616,26 +616,17 @@ impl ExternalConditions {
             diffuse_irr_total - diffuse_irr_circumsolar + ground_reflection_irradiance;
         let total_irradiance = calculated_direct + calculated_diffuse;
 
-        if diffuse_breakdown {
-            (
-                calculated_direct,
-                calculated_diffuse,
-                total_irradiance,
-                Some(DiffuseBreakdown {
-                    sky: diffuse_irr_sky,
-                    circumsolar: diffuse_irr_circumsolar,
-                    horiz: diffuse_irr_horiz,
-                    ground_refl: ground_reflection_irradiance,
-                }),
-            )
-        } else {
-            (
-                calculated_direct,
-                calculated_diffuse,
-                total_irradiance,
-                None,
-            )
-        }
+        (
+            calculated_direct,
+            calculated_diffuse,
+            total_irradiance,
+            diffuse_breakdown.then(|| DiffuseBreakdown {
+                sky: diffuse_irr_sky,
+                circumsolar: diffuse_irr_circumsolar,
+                horiz: diffuse_irr_horiz,
+                ground_refl: ground_reflection_irradiance,
+            }),
+        )
     }
 
     fn outside_solar_beam(