From 97f290bb1ecd5d2aac984dc4a3f45d4c621c8bf6 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Fri, 15 Dec 2023 15:01:20 +0100
Subject: [PATCH] generate: catch expression error in rule expansion

---
 src/generate.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/generate.rs b/src/generate.rs
index 8566e9b3..5a97f15a 100644
--- a/src/generate.rs
+++ b/src/generate.rs
@@ -717,7 +717,9 @@ fn configure_build(
 
                     let expanded =
                         nested_env::expand_eval(&rule.cmd, &flattened_env, IfMissing::Empty)
-                            .unwrap();
+                            .with_context(|| format!("while expanding cmd \"{}\"", rule.cmd))
+                            .with_context(|| format!("rule \"{}\"", rule.name))
+                            .with_context(|| format!("module \"{}\"", module.name))?;
 
                     let rule = rule.to_ninja().command(expanded).build().unwrap().named();
                     ninja_entries.insert(format!("{rule}"));