arti-config: Move cmdline to tor-config
This does not know anything about arti, only about TOML and Config. Code motion, plus necessary import adjustments.
This commit is contained in:
parent
b137be222b
commit
ab3bd9d6d5
|
@ -3428,6 +3428,7 @@ dependencies = [
|
||||||
"educe",
|
"educe",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"paste",
|
"paste",
|
||||||
|
"regex",
|
||||||
"rmp-serde",
|
"rmp-serde",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
|
|
@ -47,11 +47,10 @@
|
||||||
#![warn(clippy::unseparated_literal_suffix)]
|
#![warn(clippy::unseparated_literal_suffix)]
|
||||||
#![deny(clippy::unwrap_used)]
|
#![deny(clippy::unwrap_used)]
|
||||||
|
|
||||||
mod cmdline;
|
|
||||||
mod options;
|
mod options;
|
||||||
|
|
||||||
pub use cmdline::CmdLine;
|
|
||||||
pub use options::ARTI_DEFAULTS;
|
pub use options::ARTI_DEFAULTS;
|
||||||
|
use tor_config::CmdLine;
|
||||||
|
|
||||||
/// The synchronous configuration builder type we use.
|
/// The synchronous configuration builder type we use.
|
||||||
///
|
///
|
||||||
|
|
|
@ -20,12 +20,15 @@ tor-error = { path = "../tor-error", version = "0.3.0"}
|
||||||
tor-basic-utils = { path="../tor-basic-utils", version = "0.3.0"}
|
tor-basic-utils = { path="../tor-basic-utils", version = "0.3.0"}
|
||||||
|
|
||||||
thiserror = "1"
|
thiserror = "1"
|
||||||
|
config = { version = "0.13", default-features = false, features = ["toml"] }
|
||||||
derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
|
derive_builder = { version = "0.11.2", package = "derive_builder_fork_arti" }
|
||||||
educe = "0.4.6"
|
educe = "0.4.6"
|
||||||
once_cell = "1"
|
once_cell = "1"
|
||||||
paste = "1"
|
paste = "1"
|
||||||
|
regex = { version = "1", default-features = false, features = ["std"] }
|
||||||
serde = { version = "1.0.103", features = ["derive"] }
|
serde = { version = "1.0.103", features = ["derive"] }
|
||||||
shellexpand = { version = "2.1", package = "shellexpand-fork", optional = true }
|
shellexpand = { version = "2.1", package = "shellexpand-fork", optional = true }
|
||||||
|
toml = "0.5"
|
||||||
tracing = "0.1.18"
|
tracing = "0.1.18"
|
||||||
directories = { version = "4", optional = true }
|
directories = { version = "4", optional = true }
|
||||||
|
|
||||||
|
|
|
@ -46,11 +46,13 @@
|
||||||
#![warn(clippy::unseparated_literal_suffix)]
|
#![warn(clippy::unseparated_literal_suffix)]
|
||||||
#![deny(clippy::unwrap_used)]
|
#![deny(clippy::unwrap_used)]
|
||||||
|
|
||||||
|
pub mod cmdline;
|
||||||
mod err;
|
mod err;
|
||||||
pub mod list_builder;
|
pub mod list_builder;
|
||||||
mod mut_cfg;
|
mod mut_cfg;
|
||||||
mod path;
|
mod path;
|
||||||
|
|
||||||
|
pub use cmdline::CmdLine;
|
||||||
pub use educe;
|
pub use educe;
|
||||||
pub use err::{ConfigBuildError, ReconfigureError};
|
pub use err::{ConfigBuildError, ReconfigureError};
|
||||||
pub use mut_cfg::MutCfg;
|
pub use mut_cfg::MutCfg;
|
||||||
|
|
Loading…
Reference in New Issue