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 9 pull requests #126240

Merged
merged 18 commits into from
Jun 10, 2024
Merged

Rollup of 9 pull requests #126240

merged 18 commits into from
Jun 10, 2024

Commits on Jun 8, 2024

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

Commits on Jun 9, 2024

  1. Configuration menu
    Copy the full SHA
    d5fb825 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    041e204 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. fix: build on haiku

    SteveLauC committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    63ec8dd View commit details
    Browse the repository at this point in the history
  2. migrate tests/run-make/llvm-outputs to use rmake.rs

    binarycat committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    91f5530 View commit details
    Browse the repository at this point in the history
  3. Remove some unused crate dependencies.

    I found these by setting the `unused_crate_dependencies` lint
    temporarily to `Warn`.
    nnethercote committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    29629d0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    256387b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3c57ea0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    251d2d0 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#126063 - nnethercote:rm-unused-crate-deps, …

    …r=jackh726
    
    Remove some unused crate dependencies.
    
    I found these by setting the `unused_crate_dependencies` lint temporarily to `Warn`.
    
    r? ``@jackh726``
    matthiaskrgr committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    1832ee0 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#126115 - gurry:125876-ice-unwrap-probe-many…

    …-result, r=compiler-errors
    
    Fix ICE due to `unwrap` in `probe_for_name_many`
    
    Fixes rust-lang#125876
    
    Now `probe_for_name_many` bubbles up the error returned by `probe_op` instead of calling `unwrap` on it.
    matthiaskrgr committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    bcc6fda View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    2d7f7ff View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#126184 - RalfJung:interpret-simd-nonpow2, r…

    …=oli-obk
    
    interpret: do not ICE on padded non-pow2 SIMD vectors
    
    Fixes rust-lang/miri#3458
    
    r? ``@oli-obk``
    matthiaskrgr committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    07bb7ca View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#126191 - ivan-shrimp:nonzero_doc, r=scottmcm

    Fix `NonZero` doctest inconsistencies
    
    <!--
    If this PR is related to an unstable feature or an otherwise tracked effort,
    please link to the relevant tracking issue here. If you don't know of a related
    tracking issue or there are none, feel free to ignore this.
    
    This PR will get automatically assigned to a reviewer. In case you would like
    a specific user to review your work, you can assign it to them by using
    
        r​? <reviewer name>
    -->
    `NonZero`'s doctests contain both `?` and `.unwrap()` with no obvious reason for the difference, so this changes all of them to `?`. Also removes an explicit `std::num::NonZero`.
    matthiaskrgr committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    146f4b3 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#126211 - lolbinarycat:llvm-outputs-rmake, r…

    …=jieyouxu
    
    migrate tests/run-make/llvm-outputs to use rmake.rs
    
    part of rust-lang#121876
    
    <!--
    If this PR is related to an unstable feature or an otherwise tracked effort,
    please link to the relevant tracking issue here. If you don't know of a related
    tracking issue or there are none, feel free to ignore this.
    
    This PR will get automatically assigned to a reviewer. In case you would like
    a specific user to review your work, you can assign it to them by using
    
        r​? <reviewer name>
    -->
    matthiaskrgr committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    61eb29e View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#126212 - SteveLauC:fix/haiku, r=joboet

    fix: build on haiku
    
    ## What does this PR do
    
    The std is broken on haiku, this PR fixes it.
    
    ## To reproduce the issue
    
    ```sh
    $ cargo +nightly --version
    cargo 1.81.0-nightly (b1feb75d0 2024-06-07)
    
    $ cargo new hello
    $ cd hello
    $ cargo +nightly check -Zbuild-std --target x86_64-unknown-haiku -q
    error[E0433]: failed to resolve: use of undeclared crate or module `std`
       --> ~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/sys/pal/unix/os.rs:468:13
        |
    468 |             std::ptr::null_mut(),
        |             ^^^ use of undeclared crate or module `std`
        |
    help: consider importing one of these items
        |
    8   + use core::ptr;
        |
    8   + use crate::ptr;
        |
    help: if you import `ptr`, refer to it directly
        |
    468 -             std::ptr::null_mut(),
    468 +             ptr::null_mut(),
        |
    
    error[E0433]: failed to resolve: use of undeclared crate or module `std`
       --> ~/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/library/std/src/sys/pal/unix/os.rs:470:13
        |
    470 |             std::ptr::null_mut(),
        |             ^^^ use of undeclared crate or module `std`
        |
    help: consider importing one of these items
        |
    8   + use core::ptr;
    ```
    matthiaskrgr committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    b595078 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#126215 - gurry:125737-bad-err-anon-futs, r=…

    …lcnr
    
    Add explanatory note to async block type mismatch error
    
    The async block type mismatch error might leave the user wondering as to why it occurred. The new note should give them the needed context.
    
    Changes this diagnostic:
    ```
    error[E0308]: mismatched types
     --> src/main.rs:5:23
      |
    2 |     let a = async { 1 };
      |             ----------- the expected `async` block
    3 |     let b = async { 2 };
      |             ----------- the found `async` block
    4 |
    5 |     let bad = vec![a, b];
      |                       ^ expected `async` block, found a different `async` block
      |
      = note: expected `async` block `{async block@src/main.rs:2:13: 2:24}`
                 found `async` block `{async block@src/main.rs:3:13: 3:24}`
    ```
    
    to this:
    ```
    error[E0308]: mismatched types
     --> src/main.rs:5:23
      |
    2 |     let a = async { 1 };
      |             ----------- the expected `async` block
    3 |     let b = async { 2 };
      |             ----------- the found `async` block
    4 |
    5 |     let bad = vec![a, b];
      |                       ^ expected `async` block, found a different `async` block
      |
      = note: expected `async` block `{async block@src/main.rs:2:13: 2:24}`
                 found `async` block `{async block@src/main.rs:3:13: 3:24}`
      = note: no two async blocks, even if identical, have the same type
      = help: consider pinning your async block and and casting it to a trait object
    ```
    
    Fixes rust-lang#125737
    matthiaskrgr committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    f0adebc View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#126223 - jieyouxu:rmake-run-in-tmpdir-self-…

    …test, r=Kobzol
    
    run-make: add `run_in_tmpdir` self-test
    
    Add a basic sanity test for `run_in_tmpdir` to make sure that files (including read-only files) and directories created inside the "scratch" tmpdir are removed after the closure returns.
    
    r? ghost (while i run a try job)
    
    try-job: x86_64-msvc
    matthiaskrgr committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    d762ef1 View commit details
    Browse the repository at this point in the history