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

fix(help): Generalize --ignore-rust-version #13741

Merged
merged 1 commit into from
Apr 12, 2024
Merged

fix(help): Generalize --ignore-rust-version #13741

merged 1 commit into from
Apr 12, 2024

Conversation

epage
Copy link
Contributor

@epage epage commented Apr 11, 2024 •
edited
Loading

What does this PR try to resolve?

This is part of #9930 and updates for the help to accommodate #13738 and adding --ignore-rust-version to cargo update for when they are stable

This includes

  • Moving --ignore-rust-version to be under the "Manifest options" header
  • Generalizing the help description

How should we test and review this PR?

Additional information

@rustbot
Copy link
Collaborator

rustbot commented Apr 11, 2024

r? @ehuss

rustbot has assigned @ehuss.
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

@epage epage marked this pull request as draft April 11, 2024 21:52
@rustbot rustbot added 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 A-workspaces Area: workspaces Command-add Command-bench Command-build Command-check Command-doc Command-fix Command-run Command-rustc Command-rustdoc Command-test S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 11, 2024
@epage
Copy link
Contributor Author

epage commented Apr 11, 2024

Blocked on #13738

@epage epage mentioned this pull request Apr 11, 2024
Merged
@epage epage marked this pull request as ready for review April 12, 2024 14:48
Muscraft
Muscraft approved these changes Apr 12, 2024
View reviewed changes
Copy link
Member

@Muscraft Muscraft left a comment

Choose a reason for hiding this comment

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

Thanks!

@Muscraft
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 12, 2024

📌 Commit a0ba729 has been approved by Muscraft

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 Apr 12, 2024
@bors
Copy link
Collaborator

bors commented Apr 12, 2024

⌛ Testing commit a0ba729 with merge 6208c52...

@bors
Copy link
Collaborator

bors commented Apr 12, 2024

☀️ Test successful - checks-actions
Approved by: Muscraft
Pushing 6208c52 to master...

@bors bors merged commit 6208c52 into rust-lang:master Apr 12, 2024
21 checks passed
@epage epage deleted the msrv-ignore-help branch April 12, 2024 16:26
@bors bors mentioned this pull request Apr 12, 2024
Merged
@weihanglo weihanglo mentioned this pull request Apr 12, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 13, 2024
@bors
Auto merge of rust-lang#123874 - weihanglo:update-cargo, r=weihanglo
0cc1879 
Update cargo

8 commits in 74fd5bc730b828dbc956335b229ac34ba47f7ef7..48eca1b164695022295ce466b64b44e4e0228b08
2024-04-10 18:40:49 +0000 to 2024-04-12 21:16:36 +0000
- test: Remove add/remove death tests (rust-lang/cargo#13750)
- feat(resolve): Fallback to 'rustc -V' for MSRV resolving (rust-lang/cargo#13743)
- feat(cli): Add --ignore-rust-version to update/generate-lockfile (rust-lang/cargo#13742)
- `cargo package -p no-exist` emitt  error when the -p `package` not found (rust-lang/cargo#13735)
- fix(help): Generalize --ignore-rust-version (rust-lang/cargo#13741)
- test: don't compress test registry crates (rust-lang/cargo#13744)
- feat(reslve): Respect '--ignore-rust-version' (rust-lang/cargo#13738)
- refactor: Remove `rust_2024_compatibility` lint group (rust-lang/cargo#13740)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 13, 2024
@bors
Auto merge of rust-lang#123874 - weihanglo:update-cargo, r=weihanglo
6cfd809 
Update cargo

8 commits in 74fd5bc730b828dbc956335b229ac34ba47f7ef7..48eca1b164695022295ce466b64b44e4e0228b08
2024-04-10 18:40:49 +0000 to 2024-04-12 21:16:36 +0000
- test: Remove add/remove death tests (rust-lang/cargo#13750)
- feat(resolve): Fallback to 'rustc -V' for MSRV resolving (rust-lang/cargo#13743)
- feat(cli): Add --ignore-rust-version to update/generate-lockfile (rust-lang/cargo#13742)
- `cargo package -p no-exist` emitt  error when the -p `package` not found (rust-lang/cargo#13735)
- fix(help): Generalize --ignore-rust-version (rust-lang/cargo#13741)
- test: don't compress test registry crates (rust-lang/cargo#13744)
- feat(reslve): Respect '--ignore-rust-version' (rust-lang/cargo#13738)
- refactor: Remove `rust_2024_compatibility` lint group (rust-lang/cargo#13740)

r? ghost
@rustbot rustbot added this to the 1.79.0 milestone Apr 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Muscraft Muscraft Muscraft approved these changes

Assignees

@ehuss ehuss

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 A-workspaces Area: workspaces Command-add Command-bench Command-build Command-check Command-doc Command-fix Command-run Command-rustc Command-rustdoc Command-test S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.
5 participants
@epage @rustbot @Muscraft @bors @ehuss