1 files changed, 16 insertions, 10 deletions

diff --git a/subplotlib/src/scenario.rs b/subplotlib/src/scenario.rs
index 7a78ae5..9bcc43d 100644
--- a/subplotlib/src/scenario.rs
+++ b/subplotlib/src/scenario.rs
@@ -107,7 +107,7 @@ where
     C: ContextElement,
 {
     fn new() -> Self {
-        Self(PhantomData::default())
+        Self(PhantomData)
     }
 }
 
@@ -159,6 +159,7 @@ where
 /// This container allows the running of code within a given scenario context.
 pub struct ScenarioContext {
     title: String,
+    location: &'static str,
     inner: Container![],
     hooks: RefCell<Vec<Box<dyn ScenarioContextHookKind>>>,
 }
@@ -174,9 +175,9 @@ impl DebuggedContext {
         C: Debug,
     {
         let body = if alternate {
-            format!("{:#?}", obj)
+            format!("{obj:#?}")
         } else {
-            format!("{:?}", obj)
+            format!("{obj:?}")
         };
         self.body.push(body);
     }
@@ -212,9 +213,10 @@ impl Debug for ScenarioContext {
 }
 
 impl ScenarioContext {
-    fn new(title: &str) -> Self {
+    fn new(title: &str, location: &'static str) -> Self {
         Self {
             title: title.to_string(),
+            location,
             inner: <Container![]>::new(),
             hooks: RefCell::new(Vec::new()),
         }
@@ -303,12 +305,12 @@ impl ScenarioContext {
 /// ```
 /// # use subplotlib::prelude::*;
 ///
-/// let mut scenario = Scenario::new("example scenario");
+/// let mut scenario = Scenario::new("example scenario", "unknown");
 ///
 /// let run_step = subplotlib::steplibrary::runcmd::run::Builder::default()
 ///     .argv0("true")
 ///     .args("")
-///     .build("when I run true".to_string());
+///     .build("when I run true".to_string(), "unknown");
 /// scenario.add_step(run_step, None);
 ///
 /// ```
@@ -319,9 +321,9 @@ pub struct Scenario {
 
 impl Scenario {
     /// Create a new scenario with the given title
-    pub fn new(title: &str) -> Self {
+    pub fn new(title: &str, location: &'static str) -> Self {
         Self {
-            contexts: ScenarioContext::new(title),
+            contexts: ScenarioContext::new(title, location),
             steps: Vec::new(),
         }
     }
@@ -372,7 +374,11 @@ impl Scenario {
         // Firstly, we start all the contexts
         let mut ret = Ok(());
         let mut highest_start = None;
-        println!("scenario: {}", self.contexts.title());
+        println!(
+            "{}: scenario: {}",
+            self.contexts.location,
+            self.contexts.title()
+        );
         for (i, hook) in self.contexts.hooks.borrow().iter().enumerate() {
             let res = hook.scenario_starts(&self.contexts);
             if res.is_err() {
@@ -387,7 +393,7 @@ impl Scenario {
         if ret.is_ok() {
             let mut highest = None;
             for (i, step) in self.steps.iter().map(|(step, _)| step).enumerate() {
-                println!("  step: {}", step.step_text());
+                println!("{}:   step: {}", step.location(), step.step_text());
                 let mut highest_prep = None;
                 for (i, prep) in self.contexts.hooks.borrow().iter().enumerate() {
                     let res = prep.step_starts(&self.contexts, step.step_text());