shapelib subst: Reorder overrides

This is a bit confusing.  Early settings take precedence since they
get substituted away!

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

diff --git a/src/shapelib.rs b/src/shapelib.rs
index d68923a13550b64aea20a66893492a315bd30fc8..7de6d81375803a4c40c583b7a7409b8389548d06 100644 (file)
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -1444,9 +1444,9 @@ fn process_files_entry(
       let spec = substn(spec, "${image}", &image_table)?;
       let mut spec = c_colour_all(spec.into())?.is_y()?;
       for (k,v) in chain!{
-        fe.extra_fields.iter().filter(|(k,_v)| k.starts_with('x')),
-        &magic.substs,
         c_substs.into_iter().map(IntoIterator::into_iter).flatten(),
+        &magic.substs,
+        fe.extra_fields.iter().filter(|(k,_v)| k.starts_with('x')),
       } {
         spec = substn(spec, format!("${{{}}}", k), v)?;
       }