fix(config): Don't double-warn about $CARGO_HOME/config
#14579
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
rustbot
added
A-configuration
epage
reviewed
Sep 24, 2024
linyihai
force-pushed
the
issue-14560
branch
from
8b8ff13
to
10b0afc
Compare
linyihai
changed the title
$CARGO_HOME/config twice$CARGO_HOME/config twice
linyihai
force-pushed
the
issue-14560
branch
2 times, most recently
from
259f72d
to
c08ad3b
Compare
The core requirements for this bug are - You have a `$CARGO_HOME/.config` - Your project is inside of `$HOME` We have a check to make sure we don't double-walk `$CARGO/config` but that check is *after* we warn about there being no `.toml` extension. To fix this, we just need to move that check outside of the file lookup. This required changing the `seen` check from checking whether walked the config file to checking if we've walked the config dir. As we only have one file per directory, this should work.
epage
changed the title
$CARGO_HOME/config twice$CARGO_HOME/config
|
@bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 28, 2024
Update cargo 19 commits in eaee77dc1584be45949b75e4c4c9a841605e3a4b..80d82ca22abbee5fb7b51fa1abeb1ae34e99e88a 2024-09-19 21:10:23 +0000 to 2024-09-27 17:56:01 +0000 - Update cc to 1.1.22 (rust-lang/cargo#14607) - feat: lockfile path implies --locked on cargo install (rust-lang/cargo#14556) - feat(toml): Add `autolib` (rust-lang/cargo#14591) - fix: correct error count for `cargo check --message-format json` (rust-lang/cargo#14598) - test: relax panic output assertion (rust-lang/cargo#14602) - feat(timings): support dark color scheme in HTML output (rust-lang/cargo#14588) - feat: add CARGO_MANIFEST_PATH env variable (rust-lang/cargo#14404) - fix(config): Don't double-warn about `$CARGO_HOME/config` (rust-lang/cargo#14579) - fix(cargo-rustc): give trailing flags higher precedence on nightly (rust-lang/cargo#14587) - feat: make lockfile v4 the default (rust-lang/cargo#14595) - perf: Improve quality of completion performance traces (rust-lang/cargo#14592) - test: Remove completion tests (rust-lang/cargo#14590) - feat: Add support for completing `cargo update <TAB>` (rust-lang/cargo#14552) - test: Migrate remaining with_stdout/with_stderr calls (rust-lang/cargo#14577) - fix(resolve): Improve multi-MSRV workspaces (rust-lang/cargo#14569) - chore: Bump MSRV to 1.81 (rust-lang/cargo#14585) - Add a `--dry-run` flag to the `install` command (rust-lang/cargo#14280) - fix(resolve): Don't list transitive, incompatible dependencies as available (rust-lang/cargo#14568) - feat(complete): Upgrade clap_complete (rust-lang/cargo#14573)
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?
The core requirements for this bug are
$CARGO_HOME/.config$HOMEWe have a check to make sure we don't double-walk
$CARGO/configbutthat check is after we warn about there being no
.tomlextension.To fix this, we just need to move that check outside of the file lookup.
This required changing the
seencheck from checking whether walked theconfig file to checking if we've walked the config dir. As we only have
one file per directory, this should work.
Fixes #14560
How should we test and review this PR?
test commit added the test, fix commit fixed the issue.
Additional information