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.

Sign up for GitHub

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

Jump to bottom

Switch to using the v2 resolver in the workspace #128359

Closed
wants to merge 5 commits into from
Closed

Switch to using the v2 resolver in the workspace #128359

wants to merge 5 commits into from

Commits on Aug 2, 2024

  1. Switch to using the v2 resolver in the workspace 

    Pinning the resolver to v1 was done in 5abff37 ("Explicit set
workspace.resolver ...") in order to suppress warnings. Since there is
no specific reason not to use the new resolver and since it fixes
issues, change to `resolver = "2"`.

Fixes: rust-lang#128358
    @tgross35
    tgross35 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    c1b45ea View commit details
    Browse the repository at this point in the history

  2. Run cargo update with the new resolver

    @tgross35
    tgross35 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    b6124b6 View commit details
    Browse the repository at this point in the history

  3. Unconditionally set no-f16-f128 for compiler_builtins 

    With the v2 resolver, this has the intended behavior of building
compiler_builtins. Unfortunately, this exposes the fact that the current
stage0 compiler cannot build the `f16` and `f128` implementation of
compiler_builtins.

Unconditionally disable `f16` and `f128` for now so we can update the
resolver.
    @tgross35
    tgross35 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    f5bbf74 View commit details
    Browse the repository at this point in the history

  4. Enable std/panic-unwind when checking std 

    `std/panic-unwind` gets enabled when building the sysroot, but not when
checking `std`. This was not a problem with the v1 resolver because it
would unify features and just always enable `panic-unwind`.

With the v2 resolver, however, this causes `std` to get built twice with
different sets of features. This then causes an "multiple candidates for
`rmeta` dependency `std` found" error.

Always enable the `panic-unwind` feature to avoid this conflict.
    @tgross35
    tgross35 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    5d11e21 View commit details
    Browse the repository at this point in the history

  5. Fix normalization of panic-unwind and panic_unwind 

    From: bjorn3 <[email protected]>
    @tgross35
    tgross35 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    7446e7f View commit details
    Browse the repository at this point in the history