Skip to content

Conversation

epage
Copy link
Contributor

@epage epage commented Apr 11, 2024

What does this PR try to resolve?

This is part of #9930 and adds a fallback if the rust-version isn't set

How should we test and review this PR?

Tests are added in a separate commit so people can see how the behavior changed.

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:56
@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-generate-lockfile Command-run Command-rustc Command-rustdoc Command-test Command-update 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 #13742

@bors
Copy link
Contributor

bors commented Apr 12, 2024

☔ The latest upstream changes (presumably #13741) made this pull request unmergeable. Please resolve the merge conflicts.

@epage epage marked this pull request as ready for review April 12, 2024 18:54
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.

Thanks!

@weihanglo
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 12, 2024

📌 Commit 38718ea 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 Apr 12, 2024
@bors
Copy link
Contributor

bors commented Apr 12, 2024

⌛ Testing commit 38718ea with merge 91796b1...

@bors
Copy link
Contributor

bors commented Apr 12, 2024

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 91796b1 to master...

@bors bors merged commit 91796b1 into rust-lang:master Apr 12, 2024
@epage epage deleted the msrv-implicit branch April 12, 2024 21:15
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 13, 2024
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
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
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-generate-lockfile Command-run Command-rustc Command-rustdoc Command-test Command-update 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