subplotlib: Permit non-unit returns from context.with{,_mut}

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/subplotlib/src/scenario.rs b/subplotlib/src/scenario.rs
index 9b95737..cd83ac1 100644
--- a/subplotlib/src/scenario.rs
+++ b/subplotlib/src/scenario.rs
@@ -187,18 +187,18 @@ impl ScenarioContext {
     }
 
     /// With the extracted immutable context, run the function f.
-    pub fn with<C, F>(&self, func: F, defuse_poison: bool) -> StepResult
+    pub fn with<C, F, R>(&self, func: F, defuse_poison: bool) -> Result<R, StepError>
     where
-        F: FnOnce(&C) -> StepResult,
+        F: FnOnce(&C) -> Result<R, StepError>,
         C: ContextElement,
     {
         self.with_mut(|c: &mut C| func(&*c), defuse_poison)
     }
 
     /// With the extracted mutable context, run the function f.
-    pub fn with_mut<C, F>(&self, func: F, defuse_poison: bool) -> StepResult
+    pub fn with_mut<C, F, R>(&self, func: F, defuse_poison: bool) -> Result<R, StepError>
     where
-        F: FnOnce(&mut C) -> StepResult,
+        F: FnOnce(&mut C) -> Result<R, StepError>,
         C: ContextElement,
     {
         let sci: &ScenarioContextItem<C> = self