summaryrefslogtreecommitdiff
path: root/crates/tor-config/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix a link with nightly rustdocNick Mathewson2022-05-261-1/+1
|
* Merge branch 'config-split' into 'main'Ian Jackson2022-05-262-6/+788
|\ | | | | | | | | | | | | Break TorClientConfig out of ArtiConfig and warn on unknown config keys Closes #459 and #417 See merge request tpo/core/arti!529
| * tor-config: load: clippy: adopt two suggestionsIan Jackson2022-05-261-3/+2
| | | | | | | | We can have mem::take, hooray.
| * tor-config: load: Add missing "not".Ian Jackson2022-05-261-1/+1
| | | | | | | | | | As per https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/529#note_2807331
| * tor-config: load: Make UnrecognizedKeys not pubIan Jackson2022-05-261-1/+1
| | | | | | | | | | | | | | This was a slip. As per https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/529#note_2807330
| * tor-config: load: Add reversed testIan Jackson2022-05-251-0/+3
| |
| * tor-config: Add duplicative doc comments as per reviewIan Jackson2022-05-251-1/+6
| |
| * tor-config: load: example: Document what it does and who might write itIan Jackson2022-05-251-0/+16
| |
| * tor-config: load: Add a newlineIan Jackson2022-05-251-0/+1
| | | | | | | | This makes the function a tiny bit clearer.
| * tor-config: load: Write actual definition of the Resolvable traitIan Jackson2022-05-251-2/+18
| | | | | | | | | | This is not a doc comment because we don't want it to be public: it must refer to private fields, etc.
| * tor-config: load: Explain why not write out macro call n timesIan Jackson2022-05-251-0/+2
| |
| * tor-config: docs: add more docs about load, esp. traitsIan Jackson2022-05-251-0/+23
| |
| * tor-config: docs: add a lot of context and overview and xrefsIan Jackson2022-05-252-1/+57
| |
| * tor-config: load: Avoid destructuring assignmentIan Jackson2022-05-251-2/+2
| | | | | | | | Not available in our MSRV.
| * tor-config: load: Intersection: add more commentaryIan Jackson2022-05-251-5/+48
| |
| * tor-config: load: Drop a needless call to .into_iter()Ian Jackson2022-05-251-1/+0
| | | | | | | | I think this is a leftover from a previous version of this expression.
| * tor-config: load: Fix a misleading commentIan Jackson2022-05-251-1/+1
| | | | | | | | | | As per https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/529#note_2807070
| * tor-config: load: Rename shorter_letIan Jackson2022-05-251-2/+2
| | | | | | | | | | Instead of the wrong "prefix_len". As per https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/529#note_2807068
| * tor-config: load: DocsIan Jackson2022-05-251-2/+2
| |
| * tor-config: Typo fixes (as per review comments)Ian Jackson2022-05-251-4/+4
| |
| * tor-config: load: Introduce UnrecognizedKeys enumIan Jackson2022-05-251-23/+52
| | | | | | | | | | | | | | As per https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/529#note_2807078 This is in fact much clearer than the Option.
| * Run rustfmt following renamingIan Jackson2022-05-252-2/+3
| | | | | | | | Split into its own commit to avoid churn in the rename commits.
| * tor-config: Rename resolve_return_unrecognized, ..._ignore_...Ian Jackson2022-05-252-5/+5
| | | | | | | | | | As per https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/529#note_2807077
| * tor-config: Rename "ignored" to "unrecognized" throughoutIan Jackson2022-05-252-45/+45
| | | | | | | | | | As per review comments https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/529#note_2807076
| * tor-config: Example for load moduleIan Jackson2022-05-241-0/+46
| |
| * tor-config: Tests for ignored config key handlingIan Jackson2022-05-241-0/+56
| |
| * tor-config: Track and (by default) warn on ignored config keysIan Jackson2022-05-242-7/+103
| |
| * tor-config: Tests for support functions for tracking ignored keysIan Jackson2022-05-241-0/+80
| |
| * tor-config: Support functions for tracking ignored config keysIan Jackson2022-05-241-0/+168
| | | | | | | | This turns out to need quite a complicated algorithm.
| * Split TorClientConfig out of ArtiConfig, and Resolvable traitIan Jackson2022-05-242-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | This gets rid of `#[serde(flatten)]` which prevents serde_ignored (and other kinds of introspection) from working properly. The price is now that the toplevel has to deal with two configuration objects. The Resolvable trait is overkill right now, but is going to do More Things in a moment. In particular, we need the impl on tuples, so that the whole config can be processed in one go.
| * tor-config: Introduce Builder trait and ConfigReolveErrorIan Jackson2022-05-242-5/+60
| | | | | | | | | | | | | | | | | | We are going to need this for some generic code which is going to appear shortly. Having it produced by impl_standard_builder seems best. But that does mean being able to disable it, so extra stuff in the macro. Nothing uses this trait yet. ConfigResolveError is not used now either, but will be in a moment.
| * tor-config: Add a lint allowIan Jackson2022-05-241-0/+1
| | | | | | | | | | | | | | I don't understand why this isn't tripping all the time. Maybe because this is in a macro. Anyway, I am going to add a new invocation of this macro from within a test where, empirically, it trips.
* | Merge branch 'bug475' into 'main'Ian Jackson2022-05-251-1/+6
|\ \ | |/ |/| | | | | | | | | ConfigurationSources: Allow config files to be world-readable. Closes #475 See merge request tpo/core/arti!528
| * ConfigurationSources: Allow config files to be world-readable.Nick Mathewson2022-05-241-1/+6
| | | | | | | | Fixes #475.
* | fs-mistrust: make Mistrust have a corresponding Builder type.Nick Mathewson2022-05-241-2/+2
|/ | | | | This is an approximately minimal revision to get Builder in place; subsequent commits will clean up the API.
* Add a couple of "pub use" to make nightly rustdoc pass.Nick Mathewson2022-05-201-0/+3
|
* Remove dbg!()s in tor-configNick Mathewson2022-05-201-5/+0
| | | | This should satisfy our CI and turn it green again.
* Merge branch 'arti-config-2' into 'main'Nick Mathewson2022-05-132-0/+251
|\ | | | | | | | | Abolish arti-config, replacing with tombstone crate See merge request tpo/core/arti!508
| * tor-config: Provide useful documentation for sources moduleIan Jackson2022-05-131-0/+14
| |
| * arti-config abolition: Move functionality to tor-configIan Jackson2022-05-132-0/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This crate no longer has any reason to exist. All its remaining functionality is generic enough to go into tor-config. In this commit, we move the contents of lib.rs into a new file in tor-config. It contains: * Code motion * The minimal "mod" and "use" changes * The minimal doc comment * A new a compat alias for ConfigurationSources. The compat alias is there because various crates currently speak of arti_config::ConfigurationSources and it is most convenient to fix them up after the type is available in tor_config.
* | impl_standard_builder: Better comments explaining the parserIan Jackson2022-05-131-1/+7
| |
* | impl_standard_builder: Have it generate FooConfig::builderIan Jackson2022-05-121-0/+7
| | | | | | | | | | This deletes many handcoded impls. It also generates lots of impls that we previously didn't have.
* | impl_standard_builder: Test the Deserialize implIan Jackson2022-05-121-14/+69
|/ | | | | | | | | | Test the Deserialize impl of every config struct. This detects bugs like the one fixed in !502. The macro now becomes more complex because it needs to take options. Right now this tt-munching option parser is overkill, but this leave space for further options in the future.
* Rename impl_standard_builder from impl_default_via_builderIan Jackson2022-05-121-3/+8
| | | | | | | | | | | | I have Plans for this macro. In particular: * I have a wip branch which tests that the Builder can be deserialised from an empty config (ie, that config reading of a config with a blank section for this item works). * I think we should autogenerate $Config::builder(), and promote that, rather than $ConfigBuilder::default(). This macro could do that.
* Merge branch 'arti-config-1' into 'main'eta2022-05-122-0/+207
|\ | | | | | | | | arti-config: Move cmdline to tor-config See merge request tpo/core/arti!498
| * arti-config: Move cmdline to tor-configIan Jackson2022-05-112-0/+207
| | | | | | | | | | | | This does not know anything about arti, only about TOML and Config. Code motion, plus necessary import adjustments.
* | Define and use impl_default_via_builderIan Jackson2022-05-111-0/+25
|/
* tor-config: Export CfgPathErrorIan Jackson2022-05-111-1/+1
| | | | | It is not clear to me how this `pub enum` survived the "inaccessible pub" lint.
* Merge branch 'typos-20220504' into 'main'eta2022-05-051-3/+3
|\ | | | | | | | | Fix typos (using the typos-cli tool). See merge request tpo/core/arti!486
| * Fix typos (using the typos-cli tool).Nick Mathewson2022-05-041-3/+3
| |