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.

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

Allow specifying both sqlcipher and bundled. #511

Merged
merged 1 commit into from
Apr 23, 2019

Conversation

thomcc
Copy link
Member

@thomcc thomcc commented Apr 19, 2019

This is useful because currently, when using rusqlite in a Cargo workspace with one crate that uses sqlcipher and another that uses bundled, a build error will be triggered by an unqualified cargo build (as cargo will use the union of all features enabled by crates in the workspace).

Instead of panicing, this just emits a warning, before (mostly) ignoring that the bundled feature was specified. Note: in this configuration, we still use our bundled bindings, to avoid changing rusqlite to
handle this edge case (hence 'mostly').

This is useful because currently, when using `rusqlite` in a Cargo
workspace with one crate that uses `sqlcipher` and another that uses
`bundled`, a build error will be triggered by an unqualified `cargo
build` (as cargo will use the union of all features enabled by crates in
the workspace).

Instead of panicing, this just emits a warning, before (mostly) ignoring
that the `bundled` feature was specified. Note: in this configuration,
we still use our bundled bindings, to avoid changing `rusqlite` to
handle this edge case (hence 'mostly').
@thomcc thomcc force-pushed the no-sqlcipher-bundled-panic branch from 3099db5 to fe80b51 Compare April 19, 2019 18:57
@gwenn gwenn merged commit 3a382d2 into rusqlite:master Apr 23, 2019
@thomcc
Copy link
Member Author

thomcc commented Apr 23, 2019

We'd appreciate a release going out when you next have the opportunity to do so, to get https://github.com/mozilla/application-services/ off of my branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants