diff --git a/crates/arti-client/src/config.rs b/crates/arti-client/src/config.rs index 2ec4907cbd14471765ba300c9ad882e050df182e..3a27a01b22a5074ac14630f837d7a1f51d1b6895 100644 --- a/crates/arti-client/src/config.rs +++ b/crates/arti-client/src/config.rs @@ -18,7 +18,7 @@ use std::collections::HashMap; use std::path::Path; use std::path::PathBuf; use std::time::Duration; -pub use tor_config::{CfgPath, ConfigBuildError, Reconfigure}; +pub use tor_config::{CfgPath, CfgPathError, ConfigBuildError, Reconfigure}; /// Types for configuring how Tor circuits are built. pub mod circ { @@ -370,6 +370,11 @@ pub(crate) fn default_fs_mistrust() -> fs_mistrust::Mistrust { mistrust } +/// Return a filename for the default user configuration file. +pub fn default_config_file() -> Result<PathBuf, CfgPathError> { + CfgPath::new("${ARTI_CONFIG}/arti.toml".into()).path() +} + #[cfg(test)] mod test { #![allow(clippy::unwrap_used)] diff --git a/crates/arti-config/src/lib.rs b/crates/arti-config/src/lib.rs index a9afee128854d7b17c08515c1b05df28ea7aeabe..e555d225498ae987f4edb0269d4d04c4f11f806e 100644 --- a/crates/arti-config/src/lib.rs +++ b/crates/arti-config/src/lib.rs @@ -52,7 +52,6 @@ mod options; pub use cmdline::CmdLine; pub use options::ARTI_DEFAULTS; -use tor_config::{CfgPath, CfgPathError}; /// The synchronous configuration builder type we use. /// @@ -207,15 +206,11 @@ where builder } -/// Return a filename for the default user configuration file. -pub fn default_config_file() -> Result<PathBuf, CfgPathError> { - CfgPath::new("${ARTI_CONFIG}/arti.toml".into()).path() -} - #[cfg(test)] mod test { #![allow(clippy::unwrap_used)] use super::*; + use arti_client::config::default_config_file; use tempfile::tempdir; static EX_TOML: &str = " diff --git a/crates/arti/src/lib.rs b/crates/arti/src/lib.rs index 5f0f67165f0937b8a07607d06c24fa2b7f9e706d..781a802331119daa7a5750bc7f374caad65ef82a 100644 --- a/crates/arti/src/lib.rs +++ b/crates/arti/src/lib.rs @@ -128,8 +128,8 @@ pub use cfg::{ }; pub use logging::{LoggingConfig, LoggingConfigBuilder}; +use arti_client::config::default_config_file; use arti_client::{TorClient, TorClientConfig}; -use arti_config::default_config_file; use safelog::with_safe_logging_suppressed; use tor_rtcompat::{BlockOn, Runtime}; @@ -263,7 +263,7 @@ pub fn main_main() -> Result<()> { // correct behavior is different depending on whether the filename is given // explicitly or not. let mut config_file_help = "Specify which config file(s) to read.".to_string(); - if let Ok(default) = arti_config::default_config_file() { + if let Ok(default) = default_config_file() { // If we couldn't resolve the default config file, then too bad. If something // actually tries to use it, it will produce an error, but don't fail here // just for that reason.