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.

Sign up for GitHub

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

Jump to bottom

Make --allow-dirty imply --allow-staged #15013

Merged
merged 2 commits into from
Jan 21, 2025
Merged

Make --allow-dirty imply --allow-staged #15013

merged 2 commits into from
Jan 21, 2025

Conversation

kornelski
Copy link
Contributor

Staged changes don't really need protecting, and --allow-dirty is stronger than --allow-staged, so it can imply --allow-staged to make usage of cargo fix less verbose.

Closes #14176

@rustbot
Copy link
Collaborator

rustbot commented Jan 4, 2025

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-cli Area: Command-line interface, option parsing, etc. A-documenting-cargo-itself Area: Cargo's documentation Command-fix S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 4, 2025
@epage
Copy link
Contributor

epage commented Jan 4, 2025

As a reminder, the Cargo team's policy is that Issues need to be S-accepted before moving onto PRs

@epage epage marked this pull request as draft January 4, 2025 02:17
@rustbot rustbot added the A-cli-help Area: built-in command-line help label Jan 4, 2025
@kornelski
Copy link
Contributor Author

I don't know what else I can do to move the issue forward. My feature request hasn't been accepted nor rejected for months.

weihanglo
weihanglo approved these changes Jan 21, 2025
View reviewed changes
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.

#14176 (comment)

We've got a quorum for the FCP, and I don't think this is significant enough we need to wait for 10 days. So, I'm going to merge this now. Thanks for the contribution!

@weihanglo weihanglo marked this pull request as ready for review January 21, 2025 21:09
@weihanglo weihanglo added this pull request to the merge queue Jan 21, 2025
Merged via the queue into rust-lang:master with commit 53a2fdf Jan 21, 2025
21 checks passed
@kornelski kornelski deleted the dirty branch January 21, 2025 23:24
@weihanglo weihanglo mentioned this pull request Jan 24, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 25, 2025
@bors
Auto merge of rust-lang#136023 - weihanglo:update-cargo, r=weihanglo
1fc3491 
Update cargo

5 commits in 045bf21b36a2e1f3ed85e38278d1c3cc4305e134..cecde95c119a456c30e57d3e4b31fff5a7d83df4
2025-01-17 14:59:36 +0000 to 2025-01-24 17:15:24 +0000
- Remove unused `-C link-arg=-fuse-ld=lld` (rust-lang/cargo#15097)
- Remove `unsafe` by using `LazyLock` (rust-lang/cargo#15096)
- Print globs when workspace members can't be found (rust-lang/cargo#15093)
- Make --allow-dirty imply --allow-staged (rust-lang/cargo#15013)
- fix(config): When merging, replace rather than combining specific configuration keys (rust-lang/cargo#15066)
@rustbot rustbot added this to the 1.86.0 milestone Jan 25, 2025
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Jan 26, 2025
@bors
Auto merge of #136023 - weihanglo:update-cargo, r=weihanglo
24914e1 
Update cargo

5 commits in 045bf21b36a2e1f3ed85e38278d1c3cc4305e134..cecde95c119a456c30e57d3e4b31fff5a7d83df4
2025-01-17 14:59:36 +0000 to 2025-01-24 17:15:24 +0000
- Remove unused `-C link-arg=-fuse-ld=lld` (rust-lang/cargo#15097)
- Remove `unsafe` by using `LazyLock` (rust-lang/cargo#15096)
- Print globs when workspace members can't be found (rust-lang/cargo#15093)
- Make --allow-dirty imply --allow-staged (rust-lang/cargo#15013)
- fix(config): When merging, replace rather than combining specific configuration keys (rust-lang/cargo#15066)
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Jan 27, 2025
@bors
Auto merge of #136023 - weihanglo:update-cargo, r=weihanglo
f5d48e9 
Update cargo

5 commits in 045bf21b36a2e1f3ed85e38278d1c3cc4305e134..cecde95c119a456c30e57d3e4b31fff5a7d83df4
2025-01-17 14:59:36 +0000 to 2025-01-24 17:15:24 +0000
- Remove unused `-C link-arg=-fuse-ld=lld` (rust-lang/cargo#15097)
- Remove `unsafe` by using `LazyLock` (rust-lang/cargo#15096)
- Print globs when workspace members can't be found (rust-lang/cargo#15093)
- Make --allow-dirty imply --allow-staged (rust-lang/cargo#15013)
- fix(config): When merging, replace rather than combining specific configuration keys (rust-lang/cargo#15066)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weihanglo weihanglo weihanglo approved these changes

Assignees

@weihanglo weihanglo

Labels
A-cli Area: Command-line interface, option parsing, etc. A-cli-help Area: built-in command-line help A-documenting-cargo-itself Area: Cargo's documentation Command-fix S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.

cargo-fix: --allow-dirty to imply --allow-staged?
4 participants
@kornelski @rustbot @epage @weihanglo