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 3586d41d92bc3e0219bedd9bfa6800b3957ffeb7..76a721a04800c6193f30b1fa4aaf93781a48f88f 100644 (file)
--- 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 b580c3b92ebf526508392f9d5965c81a9193a77f..c9ba67451e5d02871516e42a0dbf614053b6400c 100644 (file)
--- 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")?;