Skip to content
New issue

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

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

Already on GitHub? # to your account

Allow Cargo.toml as configuration source #842

Merged
merged 1 commit into from
Jun 23, 2022
Merged

Allow Cargo.toml as configuration source #842

merged 1 commit into from
Jun 23, 2022

Conversation

mntns
Copy link
Contributor

@mntns mntns commented Jun 23, 2022

Due to a GitHub mishap in #754, this is a new PR containing the same commits (rebased by @Emilgardis). Just for reference, it still addresses #657.

@mntns mntns requested a review from a team as a code owner June 23, 2022 09:25
@Emilgardis Emilgardis added this to the v0.2.2 milestone Jun 23, 2022
@Emilgardis Emilgardis changed the title Allow Cargo.toml as configuration source (new) Allow Cargo.toml as configuration source Jun 23, 2022
Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Thanks :D

please fix the pr number in the changelog, maybe also rebase the commits.

@Emilgardis Emilgardis requested a review from a team June 23, 2022 15:02
@Emilgardis
Copy link
Member

can you squash the commits also?

Implement merging for configurations

Make merge take owned values

Unify field merging in config merging

Add new merging code by @Alexhuszagh

Improve CrossToml error handling

Parse configs from strings in CrossToml merge test

Fix PR number in changelog entry
Copy link
Member

@Emilgardis Emilgardis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you!

bors r+

@bors
Copy link
Contributor

bors bot commented Jun 23, 2022

Build succeeded:

@bors bors bot merged commit 7d5a8b2 into cross-rs:main Jun 23, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants