mirrors/arti.git/crates/tor-config/src/load.rs, branch arti-v2.4.0mirror of https://gitlab.torproject.org/tpo/core/arti
http://git.dilluti0n.com/mirrors/arti.git/atom?h=arti-v2.4.02026-05-27T12:05:52Zconfig: Simplify ConfigurationTree::merge_from to take &mut self.2026-05-27T12:05:52ZNick Mathewsonnickm@torproject.org2026-05-21T14:28:43Zurn:sha1:54c99e93b5d9cd0a3e1cfb66c249c7aeeba2ecceconfig: Update doctests to use Deftly, and to pass2026-05-27T12:05:52ZNick Mathewsonnickm@torproject.org2026-05-19T14:44:06Zurn:sha1:8d62f53b0a8f676ece49360184ab094d8dc0edb5
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:52ZNick Mathewsonnickm@torproject.org2026-05-19T13:25:50Zurn:sha1:8559c5df2c487df7f882ca762ea70faef7450414
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:52ZNick Mathewsonnickm@torproject.org2026-05-18T19:29:48Zurn:sha1:f9478b994ce908a952e55bf71beea824f61adcc4
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 method to fill in a builder with unset defaults2026-05-27T12:05:52ZNick Mathewsonnickm@torproject.org2026-05-18T14:13:34Zurn:sha1:f1df3d1c8d83fd63d484cccf0bf45534f0369761
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: Fix documentation of ResolutionResults2026-05-27T12:05:51ZNick Mathewsonnickm@torproject.org2026-05-18T14:19:18Zurn:sha1:1e28b26543f6d6e89e75db9345146a8e90be9cf8
It previously referred to a function that didn't exist.
config: Convert some load.rs tests to use dd(TorConfig).2026-05-18T15:53:37ZNick Mathewsonnickm@torproject.org2026-05-12T13:49:45Zurn:sha1:02690f381feefde3164b5d333a232fce7338b9d9tor-config: remove a needless clone.2026-05-18T15:53:37ZNick Mathewsonnickm@torproject.org2026-05-05T12:44:32Zurn:sha1:e434e1bfb03754c44f529cfed843aa73121bc4b1tor-config: small typo fix in docs2026-01-07T16:27:34ZSteven Engleropara@torproject.org2026-01-07T16:27:34Zurn:sha1:2a8cfd520d0707c6595d2b627a9ade3082dd4dd0tor-config: New Buildable trait.2025-12-09T16:32:14ZNick Mathewsonnickm@torproject.org2025-12-01T15:38:32Zurn:sha1:7b32da9ad6f539862a6435a15bc6cdcd988a3a14
This trait will be implemented by every type that our
derive_deftly(TorConfig) template generates. It will, among other
things, help us figure out the Builder type for a given config type
in cases where string-pasting magic is intractable, or where we
want to use assert_not_impl to double-check the attributes.