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

Rollup of 6 pull requests #132326

Merged
merged 15 commits into from
Oct 29, 2024
Merged

Rollup of 6 pull requests #132326

merged 15 commits into from
Oct 29, 2024

Commits on Oct 23, 2024

  1. Configuration menu
    Copy the full SHA
    6d569f7 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. Configuration menu
    Copy the full SHA
    ad76564 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Configuration menu
    Copy the full SHA
    c50bc62 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f202abd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3240fe2 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Don't set unnecessary module flag "LTOPostLink"

    This module flag was an internal detail of LLVM's optimization passes, and all
    code involving it was removed in LLVM 17.
    
    <llvm/llvm-project@200cc95>
    Zalathar committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    ba81dbf View commit details
    Browse the repository at this point in the history
  2. Clean up FFI calls for setting module flags

    - Don't rely on enum values defined by LLVM's C++ API
    - Use safe wrapper functions instead of direct `unsafe` calls
    - Consistently pass pointer/length strings instead of C strings
    Zalathar committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    8d2ed4f View commit details
    Browse the repository at this point in the history
  3. xous: sync: remove rustc_const_stable attribute

    These functions had `#[rustc_const_stable(feature = "const_locks", since
    = "1.63.0")]` on them because they were originally taken from
    `no_threads`. with d066dfd these no longer compile. Since other
    platforms do not have this attribute, remove it. This fixes the build
    for Xous.
    
    Signed-off-by: Sean Cross <sean@xobs.io>
    xobs committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    59944c9 View commit details
    Browse the repository at this point in the history
  4. Remove detail from label/note that is already available in other note

    Remove the "which is required by `{root_obligation}`" post-script in
    "the trait `X` is not implemented for `Y`" explanation in E0277. This
    information is already conveyed in the notes explaining requirements,
    making it redundant while making the text (particularly in labels)
    harder to read.
    
    ```
    error[E0277]: the trait bound `NotCopy: Copy` is not satisfied
      --> $DIR/wf-static-type.rs:10:13
       |
    LL | static FOO: IsCopy<Option<NotCopy>> = IsCopy { t: None };
       |             ^^^^^^^^^^^^^^^^^^^^^^^ the trait `Copy` is not implemented for `NotCopy`
       |
       = note: required for `Option<NotCopy>` to implement `Copy`
    note: required by a bound in `IsCopy`
      --> $DIR/wf-static-type.rs:7:17
       |
    LL | struct IsCopy<T:Copy> { t: T }
       |                 ^^^^ required by this bound in `IsCopy`
    ```
    vs the prior
    
    ```
    error[E0277]: the trait bound `NotCopy: Copy` is not satisfied
      --> $DIR/wf-static-type.rs:10:13
       |
    LL | static FOO: IsCopy<Option<NotCopy>> = IsCopy { t: None };
       |             ^^^^^^^^^^^^^^^^^^^^^^^ the trait `Copy` is not implemented for `NotCopy`, which is required by `Option<NotCopy>: Copy`
       |
       = note: required for `Option<NotCopy>` to implement `Copy`
    note: required by a bound in `IsCopy`
      --> $DIR/wf-static-type.rs:7:17
       |
    LL | struct IsCopy<T:Copy> { t: T }
       |                 ^^^^ required by this bound in `IsCopy`
    ```
    estebank committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    5b54286 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#131984 - dingxiangfei2009:stabilize-if-let-…

    …rescope, r=traviscross,lcnr
    
    Stabilize if_let_rescope
    
    Close rust-lang#131154
    Tracked by rust-lang#124085
    matthiaskrgr authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    5d6c499 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#132151 - compiler-errors:coroutine-resume-o…

    …utlives, r=spastorino
    
    Ensure that resume arg outlives region bound for coroutines
    
    When proving that `{Coroutine}: 'region`, we must also prove that the coroutine's resume ty outlives that region as well. See the inline comment.
    
    Fixes rust-lang#132104
    matthiaskrgr authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    5dc3639 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#132157 - estebank:long-types-3, r=jieyouxu

    Remove detail from label/note that is already available in other note
    
    Remove the "which is required by `{root_obligation}`" post-script in
    "the trait `X` is not implemented for `Y`" explanation in E0277. This
    information is already conveyed in the notes explaining requirements,
    making it redundant while making the text (particularly in labels)
    harder to read.
    
    ```
    error[E0277]: the trait bound `NotCopy: Copy` is not satisfied
      --> $DIR/wf-static-type.rs:10:13
       |
    LL | static FOO: IsCopy<Option<NotCopy>> = IsCopy { t: None };
       |             ^^^^^^^^^^^^^^^^^^^^^^^ the trait `Copy` is not implemented for `NotCopy`
       |
       = note: required for `Option<NotCopy>` to implement `Copy`
    note: required by a bound in `IsCopy`
      --> $DIR/wf-static-type.rs:7:17
       |
    LL | struct IsCopy<T:Copy> { t: T }
       |                 ^^^^ required by this bound in `IsCopy`
    ```
    vs the prior
    
    ```
    error[E0277]: the trait bound `NotCopy: Copy` is not satisfied
      --> $DIR/wf-static-type.rs:10:13
       |
    LL | static FOO: IsCopy<Option<NotCopy>> = IsCopy { t: None };
       |             ^^^^^^^^^^^^^^^^^^^^^^^ the trait `Copy` is not implemented for `NotCopy`, which is required by `Option<NotCopy>: Copy`
       |
       = note: required for `Option<NotCopy>` to implement `Copy`
    note: required by a bound in `IsCopy`
      --> $DIR/wf-static-type.rs:7:17
       |
    LL | struct IsCopy<T:Copy> { t: T }
       |                 ^^^^ required by this bound in `IsCopy`
    ```
    
    *Ignore first three commits from rust-lang#132086
    matthiaskrgr authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    f9fdd63 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#132274 - compiler-errors:cleanup-op-lookup,…

    … r=nnethercote
    
    Cleanup op lookup in HIR typeck
    
    Minor cleanup for some redundant methods involved with looking up the `Operator::operator` methods for operators.
    matthiaskrgr authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    1e3c0da View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#132319 - Zalathar:add-module-flag, r=jieyouxu

    cg_llvm: Clean up FFI calls for setting module flags
    
    This is a combination of several inter-related changes to how module flags are set:
    
    - Remove some unnecessary code for setting an `"LTOPostLink"` flag, which has been obsolete since LLVM 17.
    - Define our own enum instead of relying on enum values defined by LLVM's unstable C++ API.
    - Use safe wrapper functions to set module flags, instead of direct `unsafe` calls.
    - Consistently pass pointer/length strings instead of C strings.
    - Remove or shrink some `unsafe` blocks.
    matthiaskrgr authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    2707cd6 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#132321 - betrusted-io:xous/fix-rustc_const_…

    …stable-attribute, r=joboet
    
    xous: sync: remove `rustc_const_stable` attribute on Condvar and Mutex new()
    
    These functions had `#[rustc_const_stable(feature = "const_locks", since = "1.63.0")]` on them because they were originally taken from `no_threads`. with d066dfd these no longer compile. Since other platforms do not have this attribute, remove it. This fixes the build for Xous.
    matthiaskrgr authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    07afe8d View commit details
    Browse the repository at this point in the history