From 465ed8087e390c5d5e85b28b49f53384dae5150e Mon Sep 17 00:00:00 2001
From: Juniper Tyree <juniper.tyree@helsinki.fi>
Date: Thu, 6 Jun 2024 06:34:15 +0000
Subject: [PATCH] Small fixes

---
 .../src/cogs/habitat/almost_infinite/downscaled.rs     |  4 +---
 rustcoalescence/src/args/config/scenario.rs            | 10 ++++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/necsim/impls/no-std/src/cogs/habitat/almost_infinite/downscaled.rs b/necsim/impls/no-std/src/cogs/habitat/almost_infinite/downscaled.rs
index db2b2012a..f07bbf2d7 100644
--- a/necsim/impls/no-std/src/cogs/habitat/almost_infinite/downscaled.rs
+++ b/necsim/impls/no-std/src/cogs/habitat/almost_infinite/downscaled.rs
@@ -227,9 +227,7 @@ impl<'de> serde::Deserialize<'de> for Log2U16 {
             type Value = Log2U16;
 
             fn expecting(&self, fmt: &mut alloc::fmt::Formatter) -> alloc::fmt::Result {
-                fmt.write_str(
-                    "an integer in 2^{0; ...; 15} or its base-two scientific notation string",
-                )
+                fmt.write_str("an integer in 2^{0..=15} or its base-two scientific notation string")
             }
 
             fn visit_u64<E: serde::de::Error>(self, v: u64) -> Result<Self::Value, E> {
diff --git a/rustcoalescence/src/args/config/scenario.rs b/rustcoalescence/src/args/config/scenario.rs
index 4f5478ea8..2b8ea1850 100644
--- a/rustcoalescence/src/args/config/scenario.rs
+++ b/rustcoalescence/src/args/config/scenario.rs
@@ -18,9 +18,15 @@ pub enum Scenario {
     AlmostInfiniteNormalDispersal(rustcoalescence_scenarios::almost_infinite::normal::AlmostInfiniteNormalDispersalArguments),
     #[cfg(feature = "almost-infinite-clark2dt-dispersal-scenario")]
     AlmostInfiniteClark2DtDispersal(rustcoalescence_scenarios::almost_infinite::clark2dt::AlmostInfiniteClark2DtDispersalArguments),
-    #[cfg(feature = "almost-infinite-normal-dispersal-scenario")]
+    #[cfg(all(
+        feature = "almost-infinite-normal-dispersal-scenario",
+        feature = "almost-infinite-downscaled-scenario",
+    ))]
     AlmostInfiniteDownscaledNormalDispersal(rustcoalescence_scenarios::almost_infinite::downscaled::AlmostInfiniteDownscaledArguments<rustcoalescence_scenarios::almost_infinite::normal::AlmostInfiniteNormalDispersalScenario>),
-    #[cfg(feature = "almost-infinite-clark2dt-dispersal-scenario")]
+    #[cfg(all(
+        feature = "almost-infinite-clark2dt-dispersal-scenario",
+        feature = "almost-infinite-downscaled-scenario",
+    ))]
     AlmostInfiniteDownscaledClark2DtDispersal(rustcoalescence_scenarios::almost_infinite::downscaled::AlmostInfiniteDownscaledArguments<rustcoalescence_scenarios::almost_infinite::clark2dt::AlmostInfiniteClark2DtDispersalScenario>),
     #[cfg(feature = "wrapping-noise-scenario")]
     WrappingNoise(rustcoalescence_scenarios::wrapping_noise::WrappingNoiseArguments),