Integration of my config-rs-maint fork #174
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Matthias Beyer <[email protected]>
Signed-off-by: Matthias Beyer <[email protected]>
Signed-off-by: Matthias Beyer <[email protected]>
As reported in
hjson/hjson-rust#23
the issue of the failing tests is the serde_hjson crate. The problem can
be prevented (as reported by
hjson/hjson-rust#23 (comment)) by
disabling the default features of the crate (namingly preservation of
key order).
This commit disables the default features of serde_hjson to fix our
tests.
Signed-off-by: Matthias Beyer <[email protected]>
Signed-off-by: Matthias Beyer <[email protected]>
Signed-off-by: Matthias Beyer <[email protected]>
Signed-off-by: Matthias Beyer <[email protected]>
Signed-off-by: Matthias Beyer <[email protected]>
Signed-off-by: Matthias Beyer <[email protected]> Tested-by: Matthias Beyer <[email protected]>
Signed-off-by: Matthias Beyer <[email protected]>
…::merge() overwrite it later Signed-off-by: Matthias Beyer <[email protected]>
This patch adds a builder-pattern version of Config::merge(), which can be used for method-chain-building Config objects. Signed-off-by: Matthias Beyer <[email protected]>
Cherry picked, fixed merge conflict in Cargo.toml and ran cargo-fmt on the new tree. (cherry picked from commit 43ca83a) Signed-off-by: Matthias Beyer <[email protected]>
Signed-off-by: Matthias Beyer <[email protected]>
Because of the clash in names with the TryInto and TryFrom traits, we're renaming the functions here to try_serialize/try_deserialize. Signed-off-by: Matthias Beyer <[email protected]>
|
I'd love to get github actions patches on this branch before merging, so we actually get CI, because these changes here also removed the travis configuration. |
|
I guess I'd rather backport these changes individually for a cleaner history. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the master I've been working on for config-rs-maint. We can integrate my changes from there back here in config-rs, I'd love to do that, if everyone agrees.
Comments and suggestions welcome!