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

feat(resolver): Add v3 resolver for MSRV-aware resolving #13776

Merged
merged 1 commit into from Apr 20, 2024

Conversation

epage
Copy link
Contributor

@epage epage commented Apr 18, 2024

What does this PR try to resolve?

This is a part of #9930 and is important for changing the default with the new edition.

How should we test and review this PR?

Additional information

@rustbot
Copy link
Collaborator

rustbot commented Apr 18, 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-dependency-resolution Area: dependency resolution and the resolver A-documenting-cargo-itself Area: Cargo's documentation A-features2 Area: issues specifically related to the v2 feature resolver A-manifest Area: Cargo.toml issues A-workspaces Area: workspaces S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 18, 2024
@epage epage force-pushed the msrv-resolver branch 2 times, most recently from 72d51cc to de39bf4 Compare April 19, 2024 14:34
@bors
Copy link
Collaborator

bors commented Apr 19, 2024

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

This is a part of rust-lang#9930 and is important for changing the default with
the new edition.
@weihanglo
Copy link
Member

Looks good. Thanks!

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 20, 2024

📌 Commit d052805 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 20, 2024
@bors
Copy link
Collaborator

bors commented Apr 20, 2024

⌛ Testing commit d052805 with merge 14b46ec...

@bors
Copy link
Collaborator

bors commented Apr 20, 2024

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

1 similar comment
@bors
Copy link
Collaborator

bors commented Apr 20, 2024

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

@bors bors merged commit 14b46ec into rust-lang:master Apr 20, 2024
21 checks passed
@bors
Copy link
Collaborator

bors commented Apr 20, 2024

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

@epage epage deleted the msrv-resolver branch April 20, 2024 11:55
bors added a commit that referenced this pull request Apr 23, 2024
feat(resolver): Add default Edition2024 to resolver v3

### 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
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-dependency-resolution Area: dependency resolution and the resolver A-documenting-cargo-itself Area: Cargo's documentation A-features2 Area: issues specifically related to the v2 feature resolver A-manifest Area: Cargo.toml issues 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.

None yet

4 participants