Fix resolution with default-features = false
#1714
Merged
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
There was previously a bug in resolve where turning off the default set of features would cause resolve to not correctly settle on the set of features activated for a package. If one dependency turned off all features, and then the next dependency to be activated only turned on the default feature, the default feature wouldn't actually end up getting activated. This commit alters the check to see if the package has been previously activated to more rigorously check to see if the 'default' feature is activated previously. If a dependency doesn't use the default feature, or if the package itself does not have the feature "default", then the package is considered activated, but otherwise it needs to go through another cycle of resolution.
|
r? @huonw (rust_highfive has picked a reviewer for you, use r? to override) |
|
@bors r+ |
|
📌 Commit 0ba5a7a has been approved by |
bors
added a commit
that referenced
this pull request
Jun 14, 2015
There was previously a bug in resolve where turning off the default set of features would cause resolve to not correctly settle on the set of features activated for a package. If one dependency turned off all features, and then the next dependency to be activated only turned on the default feature, the default feature wouldn't actually end up getting activated. This commit alters the check to see if the package has been previously activated to more rigorously check to see if the 'default' feature is activated previously. If a dependency doesn't use the default feature, or if the package itself does not have the feature "default", then the package is considered activated, but otherwise it needs to go through another cycle of resolution.
|
☀️ Test successful - cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64 |
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.
There was previously a bug in resolve where turning off the default set of
features would cause resolve to not correctly settle on the set of features
activated for a package. If one dependency turned off all features, and then the
next dependency to be activated only turned on the default feature, the default
feature wouldn't actually end up getting activated.
This commit alters the check to see if the package has been previously activated
to more rigorously check to see if the 'default' feature is activated
previously. If a dependency doesn't use the default feature, or if the package
itself does not have the feature "default", then the package is considered
activated, but otherwise it needs to go through another cycle of resolution.