Skip to content

refactor(resolver): Consolidate logic in VersionPreferences#12930

Merged
bors merged 6 commits intorust-lang:masterfrom
epage:msrv-refactor
Nov 10, 2023
Merged

refactor(resolver): Consolidate logic in VersionPreferences#12930
bors merged 6 commits intorust-lang:masterfrom
epage:msrv-refactor

Conversation

@epage
Copy link
Contributor

@epage epage commented Nov 7, 2023

What does this PR try to resolve?

This makes customizing the resolver less intrusive by putting the logic in VersionPreferences and making it easy to add new priority cases to it.

In particular, this is prep for tweaking the MSRV resolver to prefer compatible versions, rather than require them.
See https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/Alternative.20MSRV-aware.20resolver.20approach.3F

How should we test and review this PR?

Each step is broken down into its own commit for easier browsing

Additional information

@rustbot
Copy link
Collaborator

rustbot commented Nov 7, 2023

r? @ehuss

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-dependency-resolution Area: dependency resolution and the resolver S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 7, 2023
@epage epage changed the title refactor(resolver) refactor(resolver): Consolidate logic in VersionPreferences Nov 8, 2023
@epage epage force-pushed the msrv-refactor branch 2 times, most recently from 3d00560 to 2c5ddc0 Compare November 8, 2023 14:15
Eh2406
Eh2406 reviewed Nov 8, 2023
View reviewed changes
src/cargo/core/resolver/version_prefs.rs
.unwrap_or(false)
};
if self.max_rust_version.is_some() {
summaries.retain(|s| s.rust_version() <= self.max_rust_version.as_ref());
Copy link
Contributor

@Eh2406 Eh2406 Nov 8, 2023

Choose a reason for hiding this comment

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

Should this still be called sort_summaries if it can remove versions?

Copy link
Contributor Author

@epage epage Nov 8, 2023

Choose a reason for hiding this comment

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

That name mismatch goes back to when I added -Zdirect-minimal-versions.

Have an idea for a better name?

Copy link
Contributor

@Eh2406 Eh2406 Nov 9, 2023

Choose a reason for hiding this comment

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

Not realy. Sorry.

@Eh2406
Copy link
Contributor

Eh2406 commented Nov 8, 2023

Looked this over and LGTM

ehuss
ehuss reviewed Nov 9, 2023
View reviewed changes
@Eh2406
Copy link
Contributor

Eh2406 commented Nov 9, 2023

r = me when you are ready.

@epage
Copy link
Contributor Author

epage commented Nov 10, 2023

@bors r=Eh2406

@bors
Copy link
Contributor

bors commented Nov 10, 2023

📌 Commit 46bb8ee has been approved by Eh2406

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 Nov 10, 2023
@bors
Copy link
Contributor

bors commented Nov 10, 2023

⌛ Testing commit 46bb8ee with merge 19a0404...

@bors
Copy link
Contributor

bors commented Nov 10, 2023

☀️ Test successful - checks-actions
Approved by: Eh2406
Pushing 19a0404 to master...

@bors bors merged commit 19a0404 into rust-lang:master Nov 10, 2023
@bors bors mentioned this pull request Nov 10, 2023
Merged
@epage epage deleted the msrv-refactor branch November 10, 2023 03:27
epage added a commit to epage/cargo that referenced this pull request Nov 10, 2023
@epage
fix(resolver): Prefer MSRV, rather than ignore incompatible
b195a92 
This is another experiment for rust-lang#9930.

Comparing preferring over exclusively using MSRV compatible:

Benefits
- Better error messages
- `--ignore-rust-version` is implicitly sticky

Downsides
- Can't backtrack for MSRV compatible version
- Still requires workspace-wide MSRV (compared to our desired end state of declaring MSRV as yet another dependency)

This builds on rust-lang#12930
@epage epage mentioned this pull request Nov 10, 2023
Merged
epage added a commit to epage/cargo that referenced this pull request Nov 10, 2023
@epage
fix(resolver): Prefer MSRV, rather than ignore incompatible
c448436 
This is another experiment for rust-lang#9930.

Comparing preferring over exclusively using MSRV compatible:

Benefits
- Better error messages
- `--ignore-rust-version` is implicitly sticky

Downsides
- Can't backtrack for MSRV compatible version
- Still requires workspace-wide MSRV (compared to our desired end state of declaring MSRV as yet another dependency)

This builds on rust-lang#12930
@weihanglo weihanglo mentioned this pull request Nov 10, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 10, 2023
@bors
Auto merge of rust-lang#117797 - weihanglo:update-cargo, r=weihanglo
8cc3e72 
Update cargo

12 commits in 7046d992f9f32ba209a8079f662ebccf9da8de25..6790a5127895debec95c24aefaeb18e059270df3
2023-11-08 03:24:57 +0000 to 2023-11-10 17:09:35 +0000
- refactor(source): Prepare for new PackageIDSpec syntax (rust-lang/cargo#12938)
- credential: include license files in all published crates (rust-lang/cargo#12953)
- fix: preserve jobserver file descriptors on rustc invocation in `fix_exec_rustc` (rust-lang/cargo#12951)
- refactor(resolver): Consolidate logic in `VersionPreferences` (rust-lang/cargo#12930)
- refactor(toml): Simplify code to make schema split easier (rust-lang/cargo#12948)
- Filter `cargo-credential-*` dependencies by OS (rust-lang/cargo#12949)
- refactor(util): Pull out `mod util_semver` (rust-lang/cargo#12940)
- Fix the invalidate feature name message (rust-lang/cargo#12939)
- refactor(util): Prepare for splitting out semver logic (rust-lang/cargo#12926)
- feat: Make browser links out of HTML file paths (rust-lang/cargo#12889)
- Do not allow empty feature name (rust-lang/cargo#12928)
- fix(timings): unnecessary backslash when error happens (rust-lang/cargo#12934)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 11, 2023
@bors
Auto merge of rust-lang#117797 - weihanglo:update-cargo, r=weihanglo
1db4b12 
Update cargo

12 commits in 7046d992f9f32ba209a8079f662ebccf9da8de25..6790a5127895debec95c24aefaeb18e059270df3
2023-11-08 03:24:57 +0000 to 2023-11-10 17:09:35 +0000
- refactor(source): Prepare for new PackageIDSpec syntax (rust-lang/cargo#12938)
- credential: include license files in all published crates (rust-lang/cargo#12953)
- fix: preserve jobserver file descriptors on rustc invocation in `fix_exec_rustc` (rust-lang/cargo#12951)
- refactor(resolver): Consolidate logic in `VersionPreferences` (rust-lang/cargo#12930)
- refactor(toml): Simplify code to make schema split easier (rust-lang/cargo#12948)
- Filter `cargo-credential-*` dependencies by OS (rust-lang/cargo#12949)
- refactor(util): Pull out `mod util_semver` (rust-lang/cargo#12940)
- Fix the invalidate feature name message (rust-lang/cargo#12939)
- refactor(util): Prepare for splitting out semver logic (rust-lang/cargo#12926)
- feat: Make browser links out of HTML file paths (rust-lang/cargo#12889)
- Do not allow empty feature name (rust-lang/cargo#12928)
- fix(timings): unnecessary backslash when error happens (rust-lang/cargo#12934)

r? ghost
epage added a commit to epage/cargo that referenced this pull request Nov 12, 2023
@epage
fix(resolver): Prefer MSRV, rather than ignore incompatible
6f941dc 
This is another experiment for rust-lang#9930.

Comparing preferring over exclusively using MSRV compatible:

Benefits
- Better error messages
- `--ignore-rust-version` is implicitly sticky

Downsides
- Can't backtrack for MSRV compatible version
- Still requires workspace-wide MSRV (compared to our desired end state of declaring MSRV as yet another dependency)

This builds on rust-lang#12930
epage added a commit to epage/cargo that referenced this pull request Nov 13, 2023
@epage
fix(resolver): Prefer MSRV, rather than ignore incompatible
be530f6 
This is another experiment for rust-lang#9930.

Comparing preferring over exclusively using MSRV compatible:

Benefits
- Better error messages
- `--ignore-rust-version` is implicitly sticky

Downsides
- Can't backtrack for MSRV compatible version
- Still requires workspace-wide MSRV (compared to our desired end state of declaring MSRV as yet another dependency)

This builds on rust-lang#12930
epage added a commit to epage/cargo that referenced this pull request Nov 13, 2023
@epage
fix(resolver): Prefer MSRV, rather than ignore incompatible
bb34609 
This is another experiment for rust-lang#9930.

Comparing preferring over exclusively using MSRV compatible:

Benefits
- Better error messages
- `--ignore-rust-version` is implicitly sticky

Downsides
- Can't backtrack for MSRV compatible version
- Still requires workspace-wide MSRV (compared to our desired end state of declaring MSRV as yet another dependency)

This builds on rust-lang#12930
epage added a commit to epage/cargo that referenced this pull request Nov 14, 2023
@epage
fix(resolver): Prefer MSRV, rather than ignore incompatible
0d29d3f 
This is another experiment for rust-lang#9930.

Comparing preferring over exclusively using MSRV compatible:

Benefits
- Better error messages
- `--ignore-rust-version` is implicitly sticky

Downsides
- Can't backtrack for MSRV compatible version
- Still requires workspace-wide MSRV (compared to our desired end state of declaring MSRV as yet another dependency)

This builds on rust-lang#12930
bors added a commit that referenced this pull request Nov 14, 2023
@bors
Auto merge of #12950 - epage:msrv, r=Eh2406
0fcc90d 
fix(resolver): Prefer MSRV, rather than ignore incompatible

### What does this PR try to resolve?

This is another experiment for #9930.

Comparing preferring over exclusively using MSRV compatible:

Benefits
- Better error messages
- `--ignore-rust-version` is implicitly sticky

Downsides
- Can't backtrack for MSRV compatible version
- Still requires workspace-wide MSRV (compared to our desired end state of declaring MSRV as yet another dependency)

### How should we test and review this PR?

### Additional information

Note: `--ignore-rust-version` is not yet implemented for the resolver.

This builds on #12930
linyihai pushed a commit to linyihai/cargo that referenced this pull request Nov 17, 2023
@epage @linyihai
fix(resolver): Prefer MSRV, rather than ignore incompatible
aeaf3f7 
This is another experiment for rust-lang#9930.

Comparing preferring over exclusively using MSRV compatible:

Benefits
- Better error messages
- `--ignore-rust-version` is implicitly sticky

Downsides
- Can't backtrack for MSRV compatible version
- Still requires workspace-wide MSRV (compared to our desired end state of declaring MSRV as yet another dependency)

This builds on rust-lang#12930
@ehuss ehuss added this to the 1.75.0 milestone Dec 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ehuss ehuss ehuss left review comments

@Eh2406 Eh2406 Eh2406 left review comments

Assignees

@ehuss ehuss

Labels

A-dependency-resolution Area: dependency resolution and the resolver 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.75.0

Development

Successfully merging this pull request may close these issues.

5 participants

@epage @rustbot @Eh2406 @bors @ehuss

Comments