feat: Stabilize MSRV-aware resolver config by epage · Pull Request #14639 · rust-lang/cargo (original) (raw)

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

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

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

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

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

• @Eh2406
• @Muscraft
• @arlosi
• @ehuss
• @epage
• @joshtriplett
• @weihanglo

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.

epage mentioned this pull request

Oct 3, 2024

27 tasks

This includes

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

This does not include

• edition = "2024"
• resolver = "3"

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

Choose a reason for hiding this comment

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

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?

Choose a reason for hiding this comment

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

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.

Choose a reason for hiding this comment

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

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

Choose a reason for hiding this comment

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

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

epage mentioned this pull request

Oct 9, 2024

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.

Choose a reason for hiding this comment

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

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

@bors r+

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

📌 Commit 498d4df has been approved by weihanglo

It is now in the queue for this repository.

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 added a commit to rust-lang-ci/rust that referenced this pull request

Oct 19, 2024

epage mentioned this pull request

Oct 21, 2024

epage deleted the stabilize-msrv-config branch

October 21, 2024 02:30

bors added a commit that referenced this pull request

Oct 21, 2024

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

Missed this in #14639

epage mentioned this pull request

Oct 23, 2024

5 tasks

epage added a commit to epage/cargo that referenced this pull request

Oct 30, 2024

epage mentioned this pull request

Oct 30, 2024

bors added a commit that referenced this pull request

Oct 30, 2024

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

github-merge-queue bot pushed a commit that referenced this pull request

Nov 15, 2024

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

tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request

Jan 22, 2025

This MR contains the following updates:

MR created with the help of el-capitano/tools/renovate-bot.

Proposed changes to behavior should be submitted there as MRs.

Release Notes

Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

♻ Rebasing: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this MR and you won't be reminded about this update again.

• If you want to rebase/retry this MR, check this box

This MR has been generated by Renovate Bot.

wip-sync pushed a commit to NetBSD/pkgsrc-wip that referenced this pull request

Feb 2, 2025

Pkgsrc changes:

• Adapt patches, one of the patched files were restructured upstream.
• Checksum changes.

Upstream changes:

Version 1.84.1 (2025-01-30)

• [Fix ICE 132920 in duplicate-crate diagnostics.] (rust-lang/rust#133304)
• [Fix errors for overlapping impls in incremental rebuilds.] (rust-lang/rust#133828)
• [Fix slow compilation related to the next-generation trait solver.] (rust-lang/rust#135618)
• [Fix debuginfo when LLVM's location discriminator value limit is exceeded.] (rust-lang/rust#135643)
• Fixes for building Rust from source:
  • [Only try to distribute llvm-objcopy if llvm tools are enabled.] (rust-lang/rust#134240)
  • [Add Profile Override for Non-Git Sources.] (rust-lang/rust#135433)
  • [Resolve symlinks of LLVM tool binaries before copying them.] (rust-lang/rust#135585)
  • [Make it possible to use ci-rustc on tarball sources.] (rust-lang/rust#135722)

Version 1.84.0 (2025-01-09)

Language

• [Allow #[deny] inside #[forbid] as a no-op] (rust-lang/rust#121560)
• [Show a warning when -Ctarget-feature is used to toggle features that can lead to unsoundness due to ABI mismatches] (rust-lang/rust#129884)
• [Use the next-generation trait solver in coherence] (rust-lang/rust#130654)
• [Allow coercions to drop the principal of trait objects] (rust-lang/rust#131857)
• [Support / as the path separator for include!() in all cases on Windows] (rust-lang/rust#125205)
• [Taking a raw ref (raw (const|mut)) of a deref of a pointer (*ptr) is now safe] (rust-lang/rust#129248)
• [Stabilize s390x inline assembly] (rust-lang/rust#131258)
• [Stabilize Arm64EC inline assembly] (rust-lang/rust#131781)
• [Lint against creating pointers to immediately dropped temporaries] (rust-lang/rust#128985)
• [Execute drop glue when unwinding in an extern "C" function] (rust-lang/rust#129582)

Compiler

• [Add --print host-tuple flag to print the host target tuple and affirm the "target tuple" terminology over "target triple"] (rust-lang/rust#125579)
• [Declaring functions with a calling convention not supported on the current target now triggers a hard error] (rust-lang/rust#129935)
• [Set up indirect access to external data for loongarch64-unknown-linux-{musl,ohos}] (rust-lang/rust#131583)
• [Enable XRay instrumentation for LoongArch Linux targets] (rust-lang/rust#131818)
• [Extend the unexpected_cfgs lint to also warn in external macros] (rust-lang/rust#132577)
• [Stabilize WebAssembly multivalue, reference-types, and tail-call target features] (rust-lang/rust#131080)
• [Added Tier 2 support for the wasm32v1-none target] (rust-lang/rust#131487)

Libraries

• [Implement From<&mut {slice}> for Box/Rc/Arc<{slice}>] (rust-lang/rust#129329)
• [Move <float>::copysign, <float>::abs, <float>::signum to core] (rust-lang/rust#131304)
• [Add LowerExp and UpperExp implementations to NonZero] (rust-lang/rust#131377)
• [Implement FromStr for CString and TryFrom<CString> for String] (rust-lang/rust#130608)
• [std::os::darwin has been made public] (rust-lang/rust#130635)

Stabilized APIs

• [Ipv6Addr::is_unique_local] (https://doc.rust-lang.org/stable/core/net/struct.Ipv6Addr.html#method.is_unique_local)
• [Ipv6Addr::is_unicast_link_local] (https://doc.rust-lang.org/stable/core/net/struct.Ipv6Addr.html#method.is_unicast_link_local)
• [core::ptr::with_exposed_provenance] (https://doc.rust-lang.org/stable/core/ptr/fn.with_exposed_provenance.html)
• [core::ptr::with_exposed_provenance_mut] (https://doc.rust-lang.org/stable/core/ptr/fn.with_exposed_provenance_mut.html)
• [<ptr>::addr] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.addr)
• [<ptr>::expose_provenance] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.expose_provenance)
• [<ptr>::with_addr] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.with_addr)
• [<ptr>::map_addr] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.map_addr)
• [<int>::isqrt] (https://doc.rust-lang.org/stable/core/primitive.i32.html#method.isqrt)
• [<int>::checked_isqrt] (https://doc.rust-lang.org/stable/core/primitive.i32.html#method.checked_isqrt)
• [<uint>::isqrt] (https://doc.rust-lang.org/stable/core/primitive.u32.html#method.isqrt)
• [NonZero::isqrt] (https://doc.rust-lang.org/stable/core/num/struct.NonZero.html#impl-NonZero%3Cu128%3E/method.isqrt)
• [core::ptr::without_provenance] (https://doc.rust-lang.org/stable/core/ptr/fn.without_provenance.html)
• [core::ptr::without_provenance_mut] (https://doc.rust-lang.org/stable/core/ptr/fn.without_provenance_mut.html)
• [core::ptr::dangling] (https://doc.rust-lang.org/stable/core/ptr/fn.dangling.html)
• [core::ptr::dangling_mut] (https://doc.rust-lang.org/stable/core/ptr/fn.dangling_mut.html)

These APIs are now stable in const contexts

• [AtomicBool::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicBool.html#method.from_ptr)
• [AtomicPtr::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicPtr.html#method.from_ptr)
• [AtomicU8::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicU8.html#method.from_ptr)
• [AtomicU16::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicU16.html#method.from_ptr)
• [AtomicU32::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicU32.html#method.from_ptr)
• [AtomicU64::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicU64.html#method.from_ptr)
• [AtomicUsize::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicUsize.html#method.from_ptr)
• [AtomicI8::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicI8.html#method.from_ptr)
• [AtomicI16::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicI16.html#method.from_ptr)
• [AtomicI32::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicI32.html#method.from_ptr)
• [AtomicI64::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicI64.html#method.from_ptr)
• [AtomicIsize::from_ptr] (https://doc.rust-lang.org/stable/core/sync/atomic/struct.AtomicIsize.html#method.from_ptr)
• [<ptr>::is_null] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.is_null-1)
• [<ptr>::as_ref] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.as_ref-1)
• [<ptr>::as_mut] (https://doc.rust-lang.org/stable/core/primitive.pointer.html#method.as_mut)
• [Pin::new] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.new)
• [Pin::new_unchecked] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.new_unchecked)
• [Pin::get_ref] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.get_ref)
• [Pin::into_ref] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.into_ref)
• [Pin::get_mut] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.get_mut)
• [Pin::get_unchecked_mut] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.get_unchecked_mut)
• [Pin::static_ref] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.static_ref)
• [Pin::static_mut] (https://doc.rust-lang.org/stable/core/pin/struct.Pin.html#method.static_mut)

Cargo

• [Stabilize MSRV-aware resolver config] (rust-lang/cargo#14639)
• [Stabilize resolver v3] (rust-lang/cargo#14754)

Rustdoc

• [rustdoc-search: improve type-driven search] (rust-lang/rust#127589)

Compatibility Notes

• [Enable by default the LSX target feature for LoongArch Linux targets] (rust-lang/rust#132140)
• The unstable -Zprofile flag ("gcov-style" coverage instrumentation) has been removed. This does not affect the stable flags for coverage instrumentation (-Cinstrument-coverage) and profile-guided optimization (-Cprofile-generate, -Cprofile-use), which are unrelated and remain available.
• Support for the target named wasm32-wasi has been removed as the target is now named wasm32-wasip1. This completes the [transition] (rust-lang/compiler-team#607) plan for this target following [the introduction of wasm32-wasip1] (rust-lang/rust#120468) in Rust 1.78. Compiler warnings on [use of wasm32-wasi] (rust-lang/rust#126662) introduced in Rust 1.81 are now gone as well as the target is removed.
• [The syntax &pin (mut|const) T is now parsed as a type which in theory could affect macro expansion results in some edge cases] (rust-lang/rust#130635 (comment))
• [Legacy syntax for calling std::arch functions is no longer permitted to declare items or bodies (such as closures, inline consts, or async blocks).] (rust-lang/rust#130443 (comment))
• The wasm32-unknown-emscripten target's binary release of the standard library is now [built with the latest emsdk 3.1.68] (rust-lang/rust#131533), which fixes an ABI-incompatibility with Emscripten >= 3.1.42. If you are locally using a version of emsdk with an incompatible ABI (e.g. before 3.1.42 or a future one), you should build your code with -Zbuild-std to ensure that std uses the correct ABI.
• [Declaring functions with a calling convention not supported on the current target now triggers a hard error] (rust-lang/rust#129935)
• [The next-generation trait solver is now enabled for coherence, fixing multiple soundness issues] (rust-lang/rust#130654)

Labels