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

fix(config): Deprecate non-extension files #13349

Merged
merged 4 commits into from
Jan 26, 2024
Merged

Conversation

epage
Copy link
Contributor

@epage epage commented Jan 26, 2024

What does this PR try to resolve?

In #7295 (released in 1.39), we said we'd want to warn on use of
.cargo/config after about 6 months. Over 4 years later, we are now
getting that warning.

This is important for addressing user confusion, like in
https://www.reddit.com/r/rust/comments/19fd5q2/cargoconfig/

How should we test and review this PR?

It'll be important to look at the individual commits as one updates tests from using .cargo/config to .cargo/config.toml which touches a lot of code.

I added a test for .cargo/config in a separate commit so you can see how the output changes.

Additional information

Discussed on zulip

In rust-lang#7295 (released in 1.39), we said we'd want to warn on use of
`.cargo/config` after about 6 months.  Over 4 years later, we are now
getting that warning.

 This is important for addressing user confusion, like in
https://www.reddit.com/r/rust/comments/19fd5q2/cargoconfig/
@rustbot
Copy link
Collaborator

rustbot commented Jan 26, 2024

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-configuration Area: cargo config files and env vars A-testing-cargo-itself Area: cargo's tests S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 26, 2024
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Hope I didn't overlook something.

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 26, 2024

📌 Commit 6eb2dde has been approved by weihanglo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 26, 2024
@bors
Copy link
Collaborator

bors commented Jan 26, 2024

⌛ Testing commit 6eb2dde with merge 3a72bf3...

@bors
Copy link
Collaborator

bors commented Jan 26, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 3a72bf3 to master...

@bors bors merged commit 3a72bf3 into rust-lang:master Jan 26, 2024
20 checks passed
@epage epage deleted the config branch January 29, 2024 19:18
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 5, 2024
Update cargo

24 commits in 7bb7b539558dc88bea44cee4168b6269bf8177b0..cdf84b69d0416c57ac9dc3459af80dfb4883d27a
2024-01-20 00:15:32 +0000 to 2024-02-02 19:39:16 +0000
- Apply `-Zpanic-abort-tests` to doctests too (rust-lang/cargo#13388)
- Don't print rustdoc command lines on failure by default (rust-lang/cargo#13387)
- Ensure `nonzero_exit_code` test isn't affected by developers `RUST_BACKTRACE` setting (rust-lang/cargo#13385)
- Add `docsrs` cfg as a well known `--check-cfg` (rust-lang/cargo#13383)
- fix(new): Print a note, rather than a comment, for more information (rust-lang/cargo#13371)
- Change tests to support changes to suggestion (rust-lang/cargo#13382)
- chore(ci): enable m1 runner (rust-lang/cargo#13377)
- fix(toml): Improve map/sequence error message (rust-lang/cargo#13376)
- fix(diagnostic): Don't panic on empty spans (rust-lang/cargo#13375)
- doc: Hide `cargo-fetch` description in offline man page (rust-lang/cargo#13364)
- feat: stabilize lockfile v4 (rust-lang/cargo#12852)
- fix(new): Print a 'Creating', rather than 'Created' status (rust-lang/cargo#13367)
- fix: use spec id instead of name to match package (rust-lang/cargo#13335)
- refactor(shell): Use new fancy anstyle API (rust-lang/cargo#13368)
- feat(cargo-update): `--precise` to allow yanked versions (rust-lang/cargo#13333)
- refactor: remove unnecessary Option in `Freshness::Dirty` (rust-lang/cargo#13361)
- doc: Replace version with `latest` for jobserver link (rust-lang/cargo#13366)
- test: data layout fix for `x86_64-unknown-none-gnu` (rust-lang/cargo#13362)
- docs(ref): Try to improve reg auth docs (rust-lang/cargo#13351)
- fix typo of rustbuild, instead of rustuild (rust-lang/cargo#13357)
- fix(config): Deprecate non-extension files (rust-lang/cargo#13349)
- fix(cli): Improve errors related to cargo script (rust-lang/cargo#13346)
- fix list option description starting with uppercase (rust-lang/cargo#13344)
- Fix typo in test (rust-lang/cargo#13342)
@ehuss ehuss added this to the 1.78.0 milestone Mar 2, 2024
proski added a commit to proski/cargo2nix that referenced this pull request Mar 31, 2024
`.cargo/config` will be deprecated in Rust 1.78.

`.cargo/config.toml` has been supported since Rust 1.38.

rust-lang/cargo#13349
proski added a commit to proski/cargo2nix that referenced this pull request Mar 31, 2024
`.cargo/config` will be deprecated in Rust 1.78.

`.cargo/config.toml` has been supported since Rust 1.38.

rust-lang/cargo#13349
proski added a commit to proski/cargo2nix that referenced this pull request Mar 31, 2024
`.cargo/config` will be deprecated in Rust 1.78.

`.cargo/config.toml` has been supported since Rust 1.38.

rust-lang/cargo#13349
proski added a commit to proski/cargo2nix that referenced this pull request Mar 31, 2024
`.cargo/config` will be deprecated in Rust 1.78.

`.cargo/config.toml` has been supported since Rust 1.38.

rust-lang/cargo#13349
proski added a commit to proski/cargo2nix that referenced this pull request Mar 31, 2024
`.cargo/config` will be deprecated in Rust 1.78.

`.cargo/config.toml` has been supported since Rust 1.38.

rust-lang/cargo#13349
proski added a commit to proski/cargo2nix that referenced this pull request Mar 31, 2024
`.cargo/config` will be deprecated in Rust 1.78.

`.cargo/config.toml` has been supported since Rust 1.38.

rust-lang/cargo#13349
proski added a commit to proski/cargo2nix that referenced this pull request Apr 3, 2024
`.cargo/config` will be deprecated in Rust 1.78.

`.cargo/config.toml` has been supported since Rust 1.38.

rust-lang/cargo#13349
proski added a commit to proski/cargo2nix that referenced this pull request Apr 3, 2024
`.cargo/config` will be deprecated in Rust 1.78.

`.cargo/config.toml` has been supported since Rust 1.38.

rust-lang/cargo#13349
proski added a commit to proski/cargo2nix that referenced this pull request Apr 3, 2024
`.cargo/config` will be deprecated in Rust 1.78.

`.cargo/config.toml` has been supported since Rust 1.38.

rust-lang/cargo#13349
chawyehsu added a commit to chawyehsu/dotfiles that referenced this pull request Apr 6, 2024
ref: rust-lang/cargo#13349

Signed-off-by: Chawye Hsu <su+git@chawyehsu.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-configuration Area: cargo config files and env vars A-testing-cargo-itself Area: cargo's tests S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants