Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration of my config-rs-maint fork #174

Closed
wants to merge 27 commits into from
Closed

Integration of my config-rs-maint fork #174

wants to merge 27 commits into from

Commits on Mar 13, 2021

  1. Remove travis 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    2921c53 View commit details
    Browse the repository at this point in the history

  2. Add srht build configuration 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    2d77910 View commit details
    Browse the repository at this point in the history

  3. Update README 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    b4c8836 View commit details
    Browse the repository at this point in the history

  4. Fix test failure 

    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 <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    b416544 View commit details
    Browse the repository at this point in the history

  5. Fix expected error message 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    e813eca View commit details
    Browse the repository at this point in the history

  6. Update Cargo.toml settings for maintenance fork 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    71adf3d View commit details
    Browse the repository at this point in the history

  7. Fix clippy: Use is_empty() instead of comparing to empty string 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    fafa2ac View commit details
    Browse the repository at this point in the history

  8. Add maintenance badge 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    9f430e8 View commit details
    Browse the repository at this point in the history

  9. Fix imports for new crate name 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Tested-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    bd121fa View commit details
    Browse the repository at this point in the history

  10. Merge branch 'srht-builds'

    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    ba7090f View commit details
    Browse the repository at this point in the history

  11. Version: 0.11.0 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    b84fed1 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'prepare-0.11'

    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    887736d View commit details
    Browse the repository at this point in the history

  13. Add a Config::set_once() function to set a value once (and let Config… 

    …::merge() overwrite it later

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    ea25d5f View commit details
    Browse the repository at this point in the history

  14. Add Config::with_merged() 

    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 <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 13, 2021
    Configuration menu
    Copy the full SHA
    e701e00 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2021

  1. Update dependency: rust-ini: 0.13 -> 0.16 

    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 <mail@beyermatthias.de>
    @decathorpe @matthiasbeyer
    decathorpe authored and matthiasbeyer committed Mar 14, 2021
    Configuration menu
    Copy the full SHA
    010895c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'add-setter'

    @matthiasbeyer
    matthiasbeyer committed Mar 14, 2021
    Configuration menu
    Copy the full SHA
    05b04b8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'builder'

    @matthiasbeyer
    matthiasbeyer committed Mar 14, 2021
    Configuration menu
    Copy the full SHA
    9802e2f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'update-rust-ini'

    @matthiasbeyer
    matthiasbeyer committed Mar 14, 2021
    Configuration menu
    Copy the full SHA
    a3f205d View commit details
    Browse the repository at this point in the history

  5. Add entry for 0.11.0 

    Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 14, 2021
    Configuration menu
    Copy the full SHA
    48db2a1 View commit details
    Browse the repository at this point in the history

  6. Rename try_into/try_from 

    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 <mail@beyermatthias.de>
    @matthiasbeyer
    matthiasbeyer committed Mar 14, 2021
    Configuration menu
    Copy the full SHA
    c26a941 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'config-rs-issue-173'

    @matthiasbeyer
    matthiasbeyer committed Mar 14, 2021
    Configuration menu
    Copy the full SHA
    def3702 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Revert "Add entry for 0.11.0" 

    This reverts commit 48db2a1.
    @matthiasbeyer
    matthiasbeyer committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    6c06a1d View commit details
    Browse the repository at this point in the history

  2. Revert "Version: 0.11.0" 

    This reverts commit b84fed1.
    @matthiasbeyer
    matthiasbeyer committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    5754b24 View commit details
    Browse the repository at this point in the history

  3. Revert "Fix imports for new crate name" 

    This reverts commit bd121fa.
    @matthiasbeyer
    matthiasbeyer committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    9f58c84 View commit details
    Browse the repository at this point in the history

  4. Revert "Update Cargo.toml settings for maintenance fork" 

    This reverts commit 71adf3d.
    @matthiasbeyer
    matthiasbeyer committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    85faa1d View commit details
    Browse the repository at this point in the history

  5. Revert "Update README" 

    This reverts commit b4c8836.
    @matthiasbeyer
    matthiasbeyer committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    9f92ab1 View commit details
    Browse the repository at this point in the history

  6. Revert "Add srht build configuration" 

    This reverts commit 2d77910.
    @matthiasbeyer
    matthiasbeyer committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    8eaeca3 View commit details
    Browse the repository at this point in the history