Skip to content

Conversation

epage
Copy link
Contributor

@epage epage commented Apr 20, 2024

What does this PR try to resolve?

With #13776 done, we can now make MSRV-aware resolver the default for the new edition as part of #9930

How should we test and review this PR?

Additional information

@rustbot
Copy link
Collaborator

rustbot commented Apr 20, 2024

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-documenting-cargo-itself Area: Cargo's documentation A-unstable Area: nightly unstable support S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 20, 2024
epage added 2 commits April 22, 2024 10:45
We still have `edition2024` guarding this.

Dealing with two feature flags to control behavior is messy.  We just
need to make sure both get stabilized :).
@epage epage force-pushed the msrv-edition2024 branch from aeded7a to 28a9d41 Compare April 22, 2024 16:17
@rustbot rustbot added the A-workspaces Area: workspaces label Apr 22, 2024
@epage epage force-pushed the msrv-edition2024 branch from 28a9d41 to 9ee4159 Compare April 22, 2024 17:14
@weihanglo
Copy link
Member

I am forgetting. Do we have any previous discussion or FCP for making MSRV resolver the default in edition 2024?

@epage
Copy link
Contributor Author

epage commented Apr 23, 2024

I am forgetting. Do we have any previous discussion or FCP for making MSRV resolver the default in edition 2024?

The RFC called for making it a default in the next edition. My plan is to stabilize it before the window closes for 2024. If not, we can adjust from there.

@weihanglo
Copy link
Member

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Apr 23, 2024

📌 Commit 9ee4159 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 23, 2024
@bors
Copy link
Contributor

bors commented Apr 23, 2024

⌛ Testing commit 9ee4159 with merge b89b81a...

@bors
Copy link
Contributor

bors commented Apr 23, 2024

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

@bors bors merged commit b89b81a into rust-lang:master Apr 23, 2024
@epage epage deleted the msrv-edition2024 branch April 23, 2024 10:44
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2024
Update cargo

7 commits in 80d5b607dde6ef97dfff4e23923822c01d2bb036..c9392675917adc2edab269eea27c222b5359c637
2024-04-19 18:39:22 +0000 to 2024-04-23 19:35:19 +0000
- fix(install): Don't respect MSRV for non-local installs (rust-lang/cargo#13790)
- gate some libc usages under cfg(unix), drop os_info features (rust-lang/cargo#13782)
- feat(resolver): Add default Edition2024 to resolver v3 (rust-lang/cargo#13785)
- Fix 2 tests for offline execution (rust-lang/cargo#13789)
- fix(toml): Report `_` fied variants (e.g. `dev_dependencies`) as deprecated (rust-lang/cargo#13783)
- feat(resolver): Add v3 resolver for MSRV-aware resolving (rust-lang/cargo#13776)
- Unused dependencies cleanup (rust-lang/cargo#13778)

r? ghost
@rustbot rustbot added this to the 1.79.0 milestone Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-documenting-cargo-itself Area: Cargo's documentation A-unstable Area: nightly unstable support A-workspaces Area: workspaces 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.

4 participants