ARTI_DEFAULTS: Move to arti crate

crates/arti-config/src/lib.rs

@@ -47,9 +47,6 @@
 #![warn(clippy::unseparated_literal_suffix)]
 #![deny(clippy::unwrap_used)]
 
-mod options;
-
-pub use options::ARTI_DEFAULTS;
 use tor_config::CmdLine;
 
 /// The synchronous configuration builder type we use.

crates/arti-config/src/options.rs

-//! Handling for arti's configuration formats.
-
-/// Default options to use for our configuration.
-//
-// TODO should this be in `arti::cfg` ?
-pub const ARTI_DEFAULTS: &str = concat!(include_str!("./arti_defaults.toml"),);

crates/arti/src/cfg.rs

@@ -11,6 +11,9 @@ use tor_config::{impl_default_via_builder, ConfigBuildError};
 
 use crate::{LoggingConfig, LoggingConfigBuilder};
 
+/// Default options to use for our configuration.
+pub const ARTI_DEFAULTS: &str = concat!(include_str!("./arti_defaults.toml"),);
+
 /// Structure to hold our application configuration options
 #[derive(Debug, Clone, Builder, Eq, PartialEq)]
 #[builder(build_fn(error = "ConfigBuildError"))]

crates/arti/src/lib.rs

@@ -126,7 +126,7 @@ use std::fmt::Write;
 
 pub use cfg::{
     ApplicationConfig, ApplicationConfigBuilder, ArtiConfig, ArtiConfigBuilder, ProxyConfig,
-    ProxyConfigBuilder, SystemConfig, SystemConfigBuilder,
+    ProxyConfigBuilder, SystemConfig, SystemConfigBuilder, ARTI_DEFAULTS,
 };
 pub use logging::{LoggingConfig, LoggingConfigBuilder};