buildRustCrate: fix merging feature flags #69170
Closed
+8
−1
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
Cargo features are always enabled if at least one crate enables them in a dependency. Previously, updateFeatures would incorrectly allow a crate to disable a feature that had been enabled by another crate. By replacing recursiveUpdate with a new function mergeFeatures, once a feature has been enabled, it cannot be disabled, matching the behaviour of Cargo.
ofborg
bot
added
6.topic: rust
10.rebuild-darwin: 0
|
@VShell can you write a small test case and add that to |
|
@VShell ping, is this still active? |
alyssais
added
the
2.status: merge conflict
ryantm
added
2.status: merge conflict
|
I marked this as stale due to inactivity. → More info |
stale
bot
added
the
2.status: stale
|
There's been some work on rust infra lately that I've seen, which may obsolete this. Since the original author of this doesn't seem interested anymore, let's close this. |
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.
Motivation for this change
Cargo features are always enabled if at least one crate enables them in
a dependency. Previously, updateFeatures would incorrectly allow a
crate to disable a feature that had been enabled by another crate. By
replacing recursiveUpdate with a new function mergeFeatures, once a
feature has been enabled, it cannot be disabled, matching the behaviour
of Cargo.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nix-review --run "nix-review wip"./result/bin/)nix path-info -Sbefore and after)Notify maintainers
cc @