fix(env): cargo:rerun-if-env-changed doesn't work with env configuration #14058
+152
−8
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
rustbot
added
A-cfg-expr
heisen-li
changed the title
epage
reviewed
Jun 13, 2024
epage
reviewed
Jun 13, 2024
epage
reviewed
Jun 13, 2024
epage
reviewed
Jun 13, 2024
heisen-li
force-pushed
the
config_env_change
branch
from
0a264a9
to
877da76
Compare
epage
reviewed
Jun 14, 2024
heisen-li
force-pushed
the
config_env_change
branch
from
513422b
to
cbe3643
Compare
epage
reviewed
Jun 26, 2024
epage
reviewed
Jun 26, 2024
heisen-li
force-pushed
the
config_env_change
branch
3 times, most recently
from
c422491
to
08bbb58
Compare
heisen-li
force-pushed
the
config_env_change
branch
from
08bbb58
to
d19af49
Compare
epage
reviewed
Jul 5, 2024
| } else { | ||
| envs.get(key).and_then(|v| v.to_owned()) | ||
| } | ||
| .xor(env::var_os(key)) |
There was a problem hiding this comment.
I missed this before, why are we using xor rather than or?
epage
reviewed
Jul 5, 2024
|
|
||
| #[cfg(windows)] | ||
| #[cargo_test] | ||
| fn rerun_if_env_changes_config_in_windows() { |
There was a problem hiding this comment.
Can you please add all tests in commits before any functionality changes?
epage
reviewed
Jul 5, 2024
| #[allow(clippy::disallowed_methods)] | ||
| fn from_env<K: AsRef<str>>(key: K) -> LocalFingerprint { | ||
| let key = key.as_ref(); | ||
| fn from_env<K: AsRef<str>>( |
There was a problem hiding this comment.
This would likely need to revert #12482.
Don't we need to update the documentation with this?
epage
reviewed
Jul 5, 2024
| @@ -5,6 +5,109 @@ use cargo_test_support::project; | |||
| use cargo_test_support::sleep_ms; | |||
| use cargo_test_support::str; | |||
|
|
|||
| #[cargo_test] | |||
| fn rerun_if_env_changes_config() { | |||
There was a problem hiding this comment.
btw I believe this would also fix #8693.
Since we should be getting that fix "for free", could you add a test for a cargo-set env variable (don't think it has to literally be that one) and mark this PR as fixing that issue as well?
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.
What does this PR try to resolve?
Fixes #10358
Additional information
Due to my stupidity, I screwed up the previous PR. I didn't know what to do with it, so I created a new PR.
r?@epage