mirrors/arti.git/crates/tor-config/src/sources.rs, branch arti-v1.0.0mirror of https://gitlab.torproject.org/tpo/core/arti
http://git.dilluti0n.com/mirrors/arti.git/atom?h=arti-v1.0.02022-08-31T16:24:39ZFix a rustdoc link error.2022-08-31T16:24:39ZNick Mathewsonnickm@torproject.org2022-08-31T16:24:39Zurn:sha1:874ba13501f92b842b20950aff44d9eff66f7af6Remove `anyhow` from `tor-config` crate2022-08-28T23:07:53ZArturo Marquezarturomf94@gmail.com2022-08-28T23:07:53Zurn:sha1:7d3d24cddf68b3d7a3f956507dcb9f886fa7a633Merge branch 'clippy' into 'main'2022-08-26T12:56:25ZNick Mathewsonnickm@torproject.org2022-08-26T12:56:25Zurn:sha1:496a5be749bc0d4ecbc11e917b325ba5985f268b
tor-config: tests: Apply standard lint block in sources.rs
See merge request tpo/core/arti!694Improve error from bad escapes in a toml config.2022-08-25T19:04:52ZNick Mathewsonnickm@torproject.org2022-08-25T17:03:20Zurn:sha1:88fa24d029f14ab7e316506e44f7602ac86d12fd
Whereas previously we would say:
```
target/debug/arti: error: invalid escape character in string: `Z` at line 9 column 14 in ../../.config/arti/arti.toml
```
we now say:
```
target/debug/arti: error: invalid escape character in string: `Z` at line 9 column 14 in ../../.config/arti/arti.toml (If you wanted to include a literal \ character, you need to escape it by writing two in a row: \\)
```
The implementation is a bit of a hack, I'm afraid, but I don't think
it's all that bad.
Closes #549.
tor-config: tests: Apply standard lint block in sources.rs2022-08-25T15:33:59ZIan Jacksonijackson@chiark.greenend.org.uk2022-08-25T15:33:59Zurn:sha1:a931ec08bd3adaa8be9d02165bd6ebd897ffbfb2
Fixes a spurious clippy warning on nightly, about a dbg!
tor-config source: just ConfigurationSource, not FoundConfigFile2022-08-25T14:58:29ZIan Jacksonijackson@chiark.greenend.org.uk2022-08-24T18:43:48Zurn:sha1:2662fd0d7197bc2d11f6d4553990a33a88c20baf
FoundConfigFile existed to hide something that ConfigurationSource now
exposes.
tor-config: Replace dir detection with ConfigurationSource enum2022-08-25T14:58:29ZIan Jacksonijackson@chiark.greenend.org.uk2022-08-24T17:56:27Zurn:sha1:9c00ec7da432a6ecd434fcb5227f50fc349c7162
As per
https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/682#note_2830860
And subsequent IRC discussion.
Having done the work as per review comments, I don't much like the
result. It's quite un-ergonomiuc. If we can't have fs autodetection,
I think syntactic autodetection within sources.rs would be nearly as
nice.
However, I seem to be outvoted. At least the externally visible
functionality (of an arti binary, say) is reasonably ergonomic.
tor-config: Provide is_syntactically_directory helper function2022-08-25T14:58:29ZIan Jacksonijackson@chiark.greenend.org.uk2022-08-24T17:56:02Zurn:sha1:e98bdf6004c0064ba9597740ce4251c248aa16e8tor-config: MustRead: Make public2022-08-25T14:58:29ZIan Jacksonijackson@chiark.greenend.org.uk2022-08-24T17:58:21Zurn:sha1:a3005d8c0a801deafcc574dde4c5c47797097e62
I think this ought to be exhaustive.
config sources: Read arti.d as well as arti.toml2022-08-25T14:58:29ZIan Jacksonijackson@chiark.greenend.org.uk2022-08-19T18:24:38Zurn:sha1:7d8b3e2f2fbd1bc8e479978eabb240739df4c1f2
Fixes #474 aka #271