From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 29 May 2021 19:38:18 +0000 (+0100)
Subject: config: Rename in_libexec and reformat
X-Git-Tag: otter-0.7.0~228
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0523b07532ac03764bed45c9cc65a85ba8bbd057;p=otter.git

config: Rename in_libexec and reformat

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

diff --git a/src/config.rs b/src/config.rs
index 336c1675..952c022c 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -149,10 +149,10 @@ impl ServerConfigSpec {
     let bundled_sources = defpath(bundled_sources, "bundled-sources"   );
     const DEFAULT_LIBRARY_GLOB: &str = "library/*.toml";
 
-    let libexec = |specd: Option<String>, leaf: &str| -> String {
+    let in_libexec = |specd: Option<String>, leaf: &str| -> String {
       specd.unwrap_or_else(|| format!("{}/{}", &libexec_dir, leaf))
     };
-    let usvg_bin = libexec(usvg_bin, "usvg");
+    let usvg_bin        = in_libexec(usvg_bin,     "usvg"              );
 
     let shapelibs = shapelibs.unwrap_or_else(||{
       let glob = defpath(None, DEFAULT_LIBRARY_GLOB);