feat: Stabilize MSRV-aware resolver config #14639

epage · 2024-10-03T19:17:53Z

What does this PR try to resolve?

This includes

cargo generate-lockfile --ignore-rust-version
cargo update --ignore-rust-version

This does not include

edition = "2024"
resolver = "3"

This is part of #9930

How should we test and review this PR?

Additional information

This is stacked on top of #14636. The commits for this PR start with the commit with a title that matches the PR title.

FCP

rustbot · 2024-10-03T19:17:58Z

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 · 2024-10-03T19:28:48Z

Note: the final touches are not in place for this PR but I assume people can check their boxes based on the whole and assuming comments on this PR will get resolved.

I propose that we stabilize the MSRV-aware resolver.

Offer an opt-in config for preferring MSRV-compatible packages over those that are incompatible, regardless of version
Packages without an MSRV are always considered compatible
If no MSRV is defined, fallback to the current toolchain's version
Small tweaks in the algorithm are allowed as changes in the algorithm won't cause changes in lockfiles
This only applies to local lockfile generation and not to cargo install

This includes stabilizing

cargo generate-lockfile --ignore-rust-version
cargo update --ignore-rust-version

This does not include stabilizing

edition = "2024"
resolver = "3"
Features around the resolver that are meant to support MSRV workflows (e.g. --update-rust-version flag)

Deviations from the RFC

Instead of the MSRV being the lowest among the workspace's MSRVs, we prioritze packages based on how many MSRVs from the workspace they are compatible with
- We only fallback to the current toolchain's version if no MSRV is set, rather than treating that as the MSRV for those packages

I had considered proposing we have this cover cargo install

When viewed only as a config and keeping in mind that cargo install only reads from the user config (and so wouldn't be affected by the current repo's config), it sounds reasonable on the surface
However, people setting something in their config for cargo install would affect any repo that doesn't have its own config. Really, cargo install does need its own [install.resolver] table.
This also gets weirder when it comes to resolver = "3" as we'd need to describe that as conditional

@rfcbot fcp merge

rfcbot · 2024-10-03T19:28:50Z

Team member @epage has proposed to merge this. The next step is review by the rest of the tagged team members:

No concerns currently listed.

Once a majority of reviewers approve (and at most 2 approvals are outstanding), this will enter its final comment period. If you spot a major issue that hasn't been raised at any point in this process, please speak up!

See this document for info about what commands tagged team members can give me.

src/doc/src/reference/rust-version.md

src/doc/src/reference/config.md

bors · 2024-10-04T17:42:33Z

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

This includes - `cargo generate-lockfile --ignore-rust-version` - `cargo update --ignore-rust-version` This does not include - `edition = "2024"` - `resolver = "3"`

src/doc/src/reference/config.md

rfcbot · 2024-10-07T22:31:13Z

🔔 This is now entering its final comment period, as per the review above. 🔔

weihanglo · 2024-10-08T21:11:23Z

src/doc/src/reference/unstable.md

- `--ignore-rust-version` CLI option
- Setting the dependency's version requirement higher than any version with a compatible `rust-version`
- Specifying the version to `cargo update` with `--precise`
+This was stabilized in 1.83 in #.


Suggested change

This was stabilized in 1.83 in #.

This was stabilized in 1.83 in [#14639](https://github.com/rust-lang/cargo/pull/14639).

BTW, do you plan not to move anything to "Stabilized" section until every feature is implemented? Should we move just these two stabilized feature under independent h2 headings, which won't break link validity?

Hadn't really thought that through. Its a question of whether the stable section is documenting features or flags. Overall, I don't have a strong preference.

I am slightly towards moving them, but not going to block this PR for that reason.

As its already that way for some parts, let's handle the decision separately

src/doc/src/reference/config.md

rfcbot · 2024-10-17T22:32:23Z

The final comment period, with a disposition to merge, as per the review above, is now complete.

As the automated representative of the governance process, I would like to thank the author for their work and everyone else who contributed.

This will be merged soon.

weihanglo

Some nitpicks as a reader that often forgot what I was reading in previous paragraphs.

src/doc/src/reference/resolver.md

weihanglo · 2024-10-18T13:54:53Z

@bors r+

The FCP has ended. To maximise the testing window I am going to merge this soon. Thank you all for your inputs!

bors · 2024-10-18T13:54:57Z

📌 Commit 498d4df has been approved by weihanglo

It is now in the queue for this repository.

bors · 2024-10-18T13:56:18Z

⌛ Testing commit 498d4df with merge cf53cc5...

bors · 2024-10-18T14:24:21Z

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

Update cargo 7 commits in 8c30ce53688e25f7e9d860b33cc914fb2957ca9a..cf53cc54bb593b5ec3dc2be4b1702f50c36d24d5 2024-10-15 16:43:16 +0000 to 2024-10-18 13:56:15 +0000 - feat: Stabilize MSRV-aware resolver config (rust-lang/cargo#14639) - Help with `[patch.crates.io]` (rust-lang/cargo#14700) - test: Migrate publish snapshotting to snapbox (rust-lang/cargo#14642) - Bump to 0.85.0; update changelog (rust-lang/cargo#14695) - Fix typo in faq.md (rust-lang/cargo#14696) - fix(registry): `HttpRegistry` `block_until_ready` returns early when work is still pending (rust-lang/cargo#14694) - fix(resolver): avoid cloning when iterating using RcVecIter (rust-lang/cargo#14690)

docs(ci): Don't constrainty latest_deps job by MSRV Missed this in #14639

Missed this in rust-lang#14639

test: Remove unused msrv-policy ### What does this PR try to resolve? Missed this in #14639 ### How should we test and review this PR? ### Additional information

### What does this PR try to resolve? This is a follow up to #14639 in prep for Edition 2024 ### How should we test and review this PR? This is stacked on #14753 ### Additional information

epage added the T-cargo Team: Cargo label Oct 3, 2024

rustbot assigned ehuss Oct 3, 2024

rfcbot added proposed-final-comment-period An FCP proposal has started, but not yet signed off. disposition-merge FCP with intent to merge labels Oct 3, 2024

epage commented Oct 3, 2024

View reviewed changes

src/doc/src/reference/rust-version.md Show resolved Hide resolved

epage commented Oct 3, 2024

View reviewed changes

src/doc/src/reference/rust-version.md Outdated Show resolved Hide resolved

epage commented Oct 3, 2024

View reviewed changes

src/doc/src/reference/rust-version.md Outdated Show resolved Hide resolved

epage commented Oct 3, 2024

View reviewed changes

src/doc/src/reference/config.md Show resolved Hide resolved

epage mentioned this pull request Oct 3, 2024

MSRV-dependent dependency version resolution #9930

Open

27 tasks

epage added 2 commits October 4, 2024 12:49

feat: Stabilize MSRV-aware resolver config

0498e84

This includes - `cargo generate-lockfile --ignore-rust-version` - `cargo update --ignore-rust-version` This does not include - `edition = "2024"` - `resolver = "3"`

docs(ref): Document MSRV-aware resolver

498d4df

epage force-pushed the stabilize-msrv-config branch from 32bf8d2 to ea2f0d2 Compare October 4, 2024 17:49

ehuss reviewed Oct 7, 2024

View reviewed changes

src/doc/src/reference/config.md Outdated Show resolved Hide resolved

epage force-pushed the stabilize-msrv-config branch from ea2f0d2 to d4bdbc4 Compare October 7, 2024 21:00

rfcbot added final-comment-period FCP — a period for last comments before action is taken and removed proposed-final-comment-period An FCP proposal has started, but not yet signed off. labels Oct 7, 2024

weihanglo reviewed Oct 8, 2024

View reviewed changes

epage mentioned this pull request Oct 9, 2024

docs(resolver): Lay groundwork for documenting MSRV-aware logic #14662

Merged

epage force-pushed the stabilize-msrv-config branch from d4bdbc4 to 15f149e Compare October 10, 2024 16:45

epage force-pushed the stabilize-msrv-config branch from cdb8304 to 68d86fc Compare October 16, 2024 12:05

rfcbot added finished-final-comment-period FCP complete to-announce and removed final-comment-period FCP — a period for last comments before action is taken labels Oct 17, 2024

weihanglo reviewed Oct 18, 2024

View reviewed changes

src/doc/src/reference/resolver.md Outdated Show resolved Hide resolved

src/doc/src/reference/resolver.md Outdated Show resolved Hide resolved

src/doc/src/reference/resolver.md Outdated Show resolved Hide resolved

src/doc/src/reference/resolver.md Outdated Show resolved Hide resolved

epage force-pushed the stabilize-msrv-config branch from 68d86fc to f3c74e7 Compare October 18, 2024 02:29

weihanglo reviewed Oct 18, 2024

View reviewed changes

src/doc/src/reference/resolver.md Outdated Show resolved Hide resolved

epage force-pushed the stabilize-msrv-config branch from f3c74e7 to 498d4df Compare October 18, 2024 08:43

weihanglo approved these changes Oct 18, 2024

View reviewed changes

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 Oct 18, 2024

bors merged commit cf53cc5 into rust-lang:master Oct 18, 2024
22 checks passed

weihanglo mentioned this pull request Oct 18, 2024

Update cargo rust-lang/rust#131910

Merged

rustbot added this to the 1.84.0 milestone Oct 19, 2024

epage mentioned this pull request Oct 21, 2024

docs(ci): Don't constrainty latest_deps job by MSRV #14711

Merged

epage deleted the stabilize-msrv-config branch October 21, 2024 02:30

bors added a commit that referenced this pull request Oct 21, 2024

Auto merge of #14711 - epage:msrc-ci, r=weihanglo

edd36eb

docs(ci): Don't constrainty latest_deps job by MSRV Missed this in #14639

epage mentioned this pull request Oct 23, 2024

Tracking Issue for Rust 2024: Cargo MSRV-dependent dependency version resolution rust-lang/rust#123749

Closed

5 tasks

epage added a commit to epage/cargo that referenced this pull request Oct 30, 2024

test: Remove unused msrv-policy

51f634b

Missed this in rust-lang#14639

epage mentioned this pull request Oct 30, 2024

test: Remove unused msrv-policy #14748

Merged

bors added a commit that referenced this pull request Oct 30, 2024

Auto merge of #14748 - epage:msrv-policy, r=Rustin170506

5f9257e

test: Remove unused msrv-policy ### What does this PR try to resolve? Missed this in #14639 ### How should we test and review this PR? ### Additional information

epage mentioned this pull request Oct 31, 2024

feat(resolver): Stabilize resolver v3 #14754

Merged

epage added the relnotes Release-note worthy label Nov 7, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Stabilize MSRV-aware resolver config #14639

feat: Stabilize MSRV-aware resolver config #14639

epage commented Oct 3, 2024 •

edited

Loading

rustbot commented Oct 3, 2024

epage commented Oct 3, 2024 •

edited

Loading

rfcbot commented Oct 3, 2024 •

edited by Eh2406

Loading

bors commented Oct 4, 2024

rfcbot commented Oct 7, 2024

weihanglo Oct 8, 2024

epage Oct 10, 2024

weihanglo Oct 10, 2024 •

edited

Loading

epage Oct 13, 2024

rfcbot commented Oct 17, 2024

weihanglo left a comment

weihanglo commented Oct 18, 2024

bors commented Oct 18, 2024

bors commented Oct 18, 2024

bors commented Oct 18, 2024

	This was stabilized in 1.83 in #.
	This was stabilized in 1.83 in [#14639](https://github.com/rust-lang/cargo/pull/14639).

feat: Stabilize MSRV-aware resolver config #14639

feat: Stabilize MSRV-aware resolver config #14639

Conversation

epage commented Oct 3, 2024 • edited Loading

What does this PR try to resolve?

How should we test and review this PR?

Additional information

rustbot commented Oct 3, 2024

epage commented Oct 3, 2024 • edited Loading

rfcbot commented Oct 3, 2024 • edited by Eh2406 Loading

bors commented Oct 4, 2024

rfcbot commented Oct 7, 2024

weihanglo Oct 8, 2024

Choose a reason for hiding this comment

epage Oct 10, 2024

Choose a reason for hiding this comment

weihanglo Oct 10, 2024 • edited Loading

Choose a reason for hiding this comment

epage Oct 13, 2024

Choose a reason for hiding this comment

rfcbot commented Oct 17, 2024

weihanglo left a comment

Choose a reason for hiding this comment

weihanglo commented Oct 18, 2024

bors commented Oct 18, 2024

bors commented Oct 18, 2024

bors commented Oct 18, 2024

epage commented Oct 3, 2024 •

edited

Loading

epage commented Oct 3, 2024 •

edited

Loading

rfcbot commented Oct 3, 2024 •

edited by Eh2406

Loading

weihanglo Oct 10, 2024 •

edited

Loading