aboutsummaryrefslogtreecommitdiff
path: root/crates/tor-config/src
Commit message (Collapse)AuthorAgeFilesLines
...
* tor-config: style fixes on CfgPathError.Nick Mathewson2022-06-221-6/+6
|
* tor-config: Don't format source error as part of error messageNick Mathewson2022-06-221-2/+2
| | | | This is one I missed earlier.
* impl_standard_builder: Allow for !DefaultIan Jackson2022-06-161-13/+54
|
* tor-config: impl_standard_builder: handle contexts with local ResultIan Jackson2022-06-161-1/+1
|
* config: Suppose that we might extend resolve_option to non-T::DefaultIan Jackson2022-06-101-0/+2
| | | | | As per point 3 in https://gitlab.torproject.org/tpo/core/arti/-/issues/488
* config: Do not strip_option for journald (and in future)Ian Jackson2022-06-101-0/+3
| | | | | As per point 1 in https://gitlab.torproject.org/tpo/core/arti/-/issues/488
* Fix typosDimitris Apostolou2022-06-052-5/+5
|
* tor-config: Fix a doc linkIan Jackson2022-06-011-1/+1
| | | | Nightly cargo doc complaints about this.
* Merge branch 'lint' into 'main'Ian Jackson2022-05-311-0/+3
|\ | | | | | | | | | | | | lints: Make lint blocks consistent and ensure they stay that way Closes #469 See merge request tpo/core/arti!557
| * lints: Add let_unit_value allow to all cratesIan Jackson2022-05-311-0/+1
| | | | | | | | | | From running add_warning, with manual picking of the right hunks/lines.
| * lints: Add lint block delimiters to every crateIan Jackson2022-05-311-0/+2
| | | | | | | | | | | | This was the result of: maint/add_warning crates/*/src/{lib,main}.rs and then manually curating the results.
* | Merge branch 'config-test' into 'main'Ian Jackson2022-05-312-2/+110
|\ \ | | | | | | | | | | | | arti config: Check that example config is exhaustive See merge request tpo/core/arti!546
| * | tor-config: Suppress unwrap lint in testsIan Jackson2022-05-311-0/+1
| | | | | | | | | | | | | | | As per https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/546#note_2808892
| * | tor-config: resolve_option tests: disable rsutfmtIan Jackson2022-05-311-0/+1
| | |
| * | tor-config: Add comprehensive tests for resolve_optionIan Jackson2022-05-311-0/+71
| | |
| * | config: Provide tor_config::resolve_option and resolve journaldIan Jackson2022-05-301-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Canonicalise the `logging.journald` setting in the validated configuration. Now it will never be `Some("")`, even if that is what was written in the config file. This allows us to write `journald = ""` in the example configuration. (Without the canonicalisation the default builder produces `None` and the example would produce `Some("")`, which are semantically identical but fail the test.) See https://gitlab.torproject.org/tpo/core/arti/-/issues/488 for some background.
| * | tor-config: Drop Serialize and Deserialize from a test typeIan Jackson2022-05-301-2/+1
| |/ | | | | | | | | These violate our rule that *built* structs ought not to be desr. But this is just in a test.
* | Merge branch 'tor-config-tests' into 'main'Nick Mathewson2022-05-314-1/+122
|\ \ | | | | | | | | | | | | Add a few coverage-based tests to tor-config. See merge request tpo/core/arti!540
| * | Add a few coverage-based tests to tor-config.Nick Mathewson2022-05-314-1/+122
| | | | | | | | | | | | There's nothing major here, but it does fill in a few gaps.
* | | Revert "Remove dbg!()s in tor-config"Ian Jackson2022-05-271-0/+5
| |/ |/| | | | | | | | | | | | | | | This was done because Nightly Rust complained about these, despite them all being in tests. That is now fixed upstream: https://github.com/rust-lang/rust-clippy/issues/8758 https://github.com/rust-lang/rust-clippy/pull/8838 This reverts commit 9d26a91886990b08dc5b6033c290d417489c61fc.
* | 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.