mirrors/arti.git/crates/tor-config/src, branch arti-v2.4.0

config: Simplify ConfigurationTree::merge_from to take &mut self.

2026-05-27T12:05:52Z

Apply 3 suggestion(s) to 2 file(s)

2026-05-27T12:05:52Z

Co-authored-by: gabi-250

config: Update doctests to use Deftly, and to pass

2026-05-27T12:05:52Z

Some of the tests used derive(Builder), which is not current practice for our configuration. Additionally, they didn't implement the requisite ConfigBuilder logic to pass with the other changes in this branch.

Give resolve_return_results options to control output_tree.

2026-05-27T12:05:52Z

I've left the options here as booleans, but moved them into a struct. (IMO, booleans are at their riskiest when they are passed as function arguments, and much less risky when they are used as struct fields.)

config: Add an `output_tree` to our resolver methods.

2026-05-27T12:05:52Z

This functionality exposes the part of the configuration tree that was actually used, along with any defaulted values. RPC will want this.

config: Add a dd(TorConfig) attribute to override apply_defaults().

2026-05-27T12:05:52Z

config: Add a method to fill in a builder with unset defaults

2026-05-27T12:05:52Z

This new method modifies a builder by replacing any unset values that have a default with that default. We're using this method so that we can re-serialize a builder into a `ConfigurationTree` with all of its default values included. In all cases, `b.apply_defaults()?; b.build()` should produce the same output as `b.build()`. The interesting parts of this commit are in tor_config::load and tor_config::derive. The rest of this commit just adds `apply_defaults` to other builders that _aren't_ made with `derive_deftly(TorConfig)`.

config: Implement Builder for ListBuilders and MapBuilders.

2026-05-27T12:05:52Z

This isn't strictly necessary, but it helps for consistency.

dd(TorConfig): change the order of default vs magic

2026-05-27T12:05:51Z

This affects the automatic builder code made by our derive_deftly macro. It is only relevant (for now) in the case of the `NonZero<>` types and their special handling. Previously, when a builder contained Option, and we wanted to generate a configuration holding T, we would _first_ apply a transformation from Option to Option and _second_ unwrap the result or apply a default. Now, we _first_ convert from Option to U by applying a default, and only _then_ perform any necessary conversion from U and T. This is only relevant in the case where U and T are different. It simplifies writing the defaults for `NonZero` options, and will significantly simplify the logic for setting builder defaults.

config: Fix documentation of ResolutionResults

2026-05-27T12:05:51Z

It previously referred to a function that didn't exist.