config; Better contexts for errors

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/config.rs b/src/config.rs
index 56abf1d7086e90459e458ba8d25d8a39660c733e..93cc168eb8cef74c7cc9823813f59f5c8370d310 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -254,19 +254,22 @@ impl Aggregate {
       let sn = sn.parse().dcontext(&sn)?;
       let vars = &section.values;
 
-      for key in vars.keys() {
-        let skl = if key == "server" {
-          SKL::ServerName
-        } else {
-          *self.keys_allowed.get(key.as_str()).ok_or_else(
-            || anyhow!("unknown configuration key {:?}", key)
-          )?
-        };
-        if ! skl.contains(&sn, self.end) {
-          throw!(anyhow!(
- "configuration key {:?} not applicable in this kind of section: {}",
-            key, &sn))
-        }
+      for (key, val) in vars {
+        (||{
+          let skl = if key == "server" {
+            SKL::ServerName
+          } else {
+            *self.keys_allowed.get(key.as_str()).ok_or_else(
+              || anyhow!("unknown configuration key")
+            )?
+          };
+          if ! skl.contains(&sn, self.end) {
+            throw!(anyhow!("key not applicable in this kind of section"))
+          }
+          Ok::<_,AE>(())
+        })()
+          .with_context(|| format!("key {:?}", key))
+          .with_context(|| val.loc.to_string())?
       }
 
       let ent = self.sections.entry(sn)
@@ -299,7 +302,7 @@ impl Aggregate {
             Ok::<_,AE>(unq)
           })()
             .with_context(|| format!("key {:?}", key))
-            .dcontext(path_for_loc)?
+            .with_context(|| loc.to_string())?
         } else {
           raw.clone()
         };