Replace redact with derive_more

Next try. Get back the nicer debug output.

Cargo.toml

@@ -20,11 +20,11 @@ strip = true
 anyhow = "1.0"
 btleplug = "0.11.6"
 clap = { version = "4.5.21", features = ["derive", "env", "wrap_help"] }
+derive_more = { version = "1.0.0", features = ["debug"] }
 env_logger = "0.11.3"
 futures = "0.3.19"
 log = "0.4.17"
 rand = "0.8.4"
-redact = { version = "0.1.10", features = ["serde"] }
 rumqttc = "0.24.0"
 ruuvi-sensor-protocol = "0.6.1"
 serde = { version = "1.0", features = ["derive"] }

src/config.rs

@@ -1,9 +1,9 @@
-use std::{collections::HashMap, fmt, fs, path::PathBuf, time::Duration};
+use std::{collections::HashMap, fs, path::PathBuf, time::Duration};
 
 use anyhow::{Context, Result};
 use clap::{CommandFactory, Parser};
+use derive_more::Debug;
 use rand::Rng;
-use redact::Secret;
 use serde::Deserialize;
 use serde_with::{formats::Flexible, serde_as, DisplayFromStr, DurationSeconds};
 use sysinfo::System;
@@ -25,7 +25,8 @@ pub struct Mqtt {
     #[serde(default = "default_mqtt_port")]
     pub port: u16,
     pub user: Option<String>,
-    pub password: Option<Secret<String>>,
+    #[debug("{}", fmt_secret(password))]
+    pub password: Option<String>,
     #[serde(default = "default_mqtt_client_id")]
     pub client_id: String,
     #[serde_as(as = "DurationSeconds<u32, Flexible>")]
@@ -92,10 +93,10 @@ fn default_mqtt_base_topic() -> String {
     String::from("ruuvi2mqtt")
 }
 
-fn fmt_secret(value: &Option<String>, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+fn fmt_secret(value: &Option<String>) -> &str {
     match value {
-        None => formatter.write_str("None"),
-        Some(_) => formatter.write_str("Some(<REDACTED>)"),
+        None => "None",
+        Some(_) => "Some(<REDACTED>)",
     }
 }
 

src/mqtt.rs

@@ -49,7 +49,6 @@ impl Mqtt {
             let password = config
                 .password
                 .as_ref()
-                .map(|secret| secret.expose_secret())
                 .context("MQTT password not specified")?;
             options.set_credentials(user, password);
         }