From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 31 Mar 2022 00:21:24 +0000 (+0100)
Subject: clippy: Miscellaneous minor changes, and allow lints
X-Git-Tag: otter-1.0.0~51
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=58dfc1d7c674fe56bc84c2e4ae5314ca8b5945f5;p=otter.git

clippy: Miscellaneous minor changes, and allow lints

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

diff --git a/clippy-options b/clippy-options
index 3586d41d..76a721a0 100644
--- a/clippy-options
+++ b/clippy-options
@@ -19,3 +19,4 @@
 -A clippy::needless_splitn
 -A clippy::type_complexity
 -A clippy::redundant_closure
+-A clippy::useless_format
diff --git a/src/config.rs b/src/config.rs
index b580c3b9..c9ba6745 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -142,13 +142,12 @@ impl ServerConfigSpec {
     let game_rng = fake_rng.make_game_rng();
     let home = || env::var("HOME").context("HOME");
 
-    let prctx;
-    if let Some(ref cd) = change_directory {
-      prctx = prmeth.chdir(cd)
+    let prctx = if let Some(ref cd) = change_directory {
+      prmeth.chdir(cd)
         .with_context(|| cd.clone())
-        .context("config change_directory")?;
+        .context("config change_directory")?
     } else {
-      prctx = PathResolveContext::Noop;
+      PathResolveContext::Noop
     };
 
     let defpath = |specd: Option<String>, leaf: &str| -> String {
@@ -251,7 +250,7 @@ impl ServerConfigSpec {
       // to toml and merging it with the stuff from the file.
       (||{
         if let Some(v) = env::var_os(LOG_ENV_VAR) {
-          let v = v.to_str().ok_or(anyhow!("UTF-8 conversion"))?;
+          let v = v.to_str().ok_or_else(|| anyhow!("UTF-8 conversion"))?;
           let v = LogSpecification::parse(v).context("parse")?;
           let mut buf: Vec<u8> = default();
           v.to_toml(&mut buf).context("convert to toml")?;