From 098eed193b40ad285b24c25a1e8dd27e6c32f34f Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 14 May 2022 15:36:21 +0100 Subject: [PATCH] shapelib: Substitute _colour multiple times if necessary No, or many, is not an error here. Signed-off-by: Ian Jackson --- src/shapelib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shapelib.rs b/src/shapelib.rs index f52e3e5b..e615368f 100644 --- a/src/shapelib.rs +++ b/src/shapelib.rs @@ -1233,6 +1233,7 @@ fn process_files_entry( c_colour: Option<(&'static str, &str)>, c_abbrev: Option<(&'static str, &str)>, | { + let c_colour_all = colour_subst_1(substn, c_colour); let c_colour = colour_subst_1(subst, c_colour); let c_abbrev = colour_subst_1(subst, c_abbrev); @@ -1282,7 +1283,7 @@ fn process_files_entry( .replace_all(&magic.template, |caps: ®ex::Captures| { format!("{}{}", caps.get(1).unwrap().as_str(), &image_table) }); - let spec = c_colour(&spec)?; + let spec = c_colour_all(&spec)?; trace!("magic item {}\n\n{}\n", &item_name, &spec); -- 2.30.2