From 0a324f843fdeadffa7f9fab381b4911563b2d8af Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 27 May 2022 17:10:40 +0100 Subject: [PATCH] mistrust: Canonicalise prefix from Some("") to None This allows us to add the proper default example to the arti example config file. --- crates/arti/src/arti-example-config.toml | 1 + crates/fs-mistrust/src/lib.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/crates/arti/src/arti-example-config.toml b/crates/arti/src/arti-example-config.toml index 182befc92..728abd362 100644 --- a/crates/arti/src/arti-example-config.toml +++ b/crates/arti/src/arti-example-config.toml @@ -97,6 +97,7 @@ # (This is not the default.) # # ignore_prefix = "/home/" +#ignore_prefix = "" # Replacement values for consensus parameters. This is an advanced option # and you probably should leave it alone. Not all parameters are supported. diff --git a/crates/fs-mistrust/src/lib.rs b/crates/fs-mistrust/src/lib.rs index 67ec364ea..b4df28c33 100644 --- a/crates/fs-mistrust/src/lib.rs +++ b/crates/fs-mistrust/src/lib.rs @@ -358,6 +358,7 @@ pub struct Mistrust { #[allow(clippy::option_option)] fn canonicalize_opt_prefix(prefix: &Option>) -> Result> { match prefix { + Some(Some(path)) if path.as_os_str().is_empty() => Ok(None), Some(Some(path)) => Ok(Some( path.canonicalize() .map_err(|e| Error::inspecting(e, path))?,