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 8 pull requests #128011

Merged
merged 33 commits into from
Jul 21, 2024
Merged

Rollup of 8 pull requests #128011

merged 33 commits into from
Jul 21, 2024

Commits on Jul 15, 2024

  1. Ignore allocation bytes in one more mir-opt test

    Following on PR rust-lang#126502, add `rustc -Zdump-mir-exclude-alloc-bytes`
    to tests/mir-opt/dataflow-const-prop/aggregate_copy.rs as well
    to skip writing allocation bytes in MIR dumps.
    
    Fixes rust-lang#126261
    uweigand committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    636ddcb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fae6037 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. Configuration menu
    Copy the full SHA
    572ba97 View commit details
    Browse the repository at this point in the history
  2. Add wasm32-wasip2 to build-manifest tool

    This is an accidental omission of mine from rust-lang#126967 which means that
    `rustup target add wasm32-wasip2` isn't working on today's nightlies.
    alexcrichton committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    aebf4d0 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Configuration menu
    Copy the full SHA
    1b4972b View commit details
    Browse the repository at this point in the history
  2. compiletest/rmake: make {source,build}_root path calculation more r…

    …obust for rmake.rs setup
    jieyouxu committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    23f32f4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6ca3109 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2eb8810 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    01ed951 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    49ca9ff View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9f2a660 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    cf5edfe View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    f5488f0 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    2383e9d View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    aa22102 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    993d83a View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    063ed0f View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    590c01a View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    eec3c3d View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. Allow concat in repetitions

    c410-f3r committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    b8d4e4d View commit details
    Browse the repository at this point in the history
  2. compiletest/rmake: prune unused RUST_BUILD_STAGE and explain env va…

    …rs passed to recipes
    jieyouxu committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    3e77f7c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c863525 View commit details
    Browse the repository at this point in the history
  4. compiletest/rmake: avoid double test directory for rmake.rs tests

    This is important for other tests that have various things like modes,
    revisions and the like. These features are not supported in run-make
    tests, so we don't need the double layering.
    jieyouxu committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    2c867d0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a8463be View commit details
    Browse the repository at this point in the history
  6. Remove _tls_used hack

    ChrisDenton committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    af735f3 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#127720 - c410-f3r:concat-rep, r=cjgillot

    [`macro_metavar_expr_concat`] Allow `concat` in repetitions
    
    cc rust-lang#127723
    matthiaskrgr authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    fba6e1e View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#127734 - ChrisDenton:netc, r=Mark-Simulacrum

    Windows: move BSD socket shims to netc
    
    On Windows we need to alter a few types so that they can be used in the cross-platform socket code. Currently these alterations are spread throughout the `c` module with some more in the `netc` module.
    
    Let's gather all our BSD compatibility shims in the `netc` module so it's all in one place and easier to discover.
    matthiaskrgr authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    b3d682c View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#127752 - uweigand:s390x-miropt-update, r=Ma…

    …rk-Simulacrum
    
    Ignore allocation bytes in one more mir-opt test
    
    Following on PR rust-lang#126502, add `rustc -Zdump-mir-exclude-alloc-bytes` to tests/mir-opt/dataflow-const-prop/aggregate_copy.rs as well to skip writing allocation bytes in MIR dumps.
    
    Fixes rust-lang#126261
    matthiaskrgr authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    ea9b1af View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#127839 - ehuss:safe-directory-docker, r=Mar…

    …k-Simulacrum
    
    Fix git safe-directory path for docker images
    
    This fixes the path for configuring the git safe.directory setting inside docker images. AFAIK, `~/gitconfig` without a dot is not something that git uses ([ref](https://git-scm.com/docs/git-config)). This was needed in my environment to avoid the ` fatal: detected dubious ownership in repository at '/checkout'` error. For context, this was added in rust-lang#99967.
    matthiaskrgr authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    60f3891 View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#127867 - alexcrichton:add-wasm32-wasip2-to-…

    …dist-manifest, r=Mark-Simulacrum
    
    Add `wasm32-wasip2` to `build-manifest` tool
    
    This is an accidental omission of mine from rust-lang#126967 which means that `rustup target add wasm32-wasip2` isn't working on today's nightlies.
    matthiaskrgr authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    dd8113e View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#127958 - jieyouxu:compiletest-rmake-cleanup…

    …, r=Kobzol
    
    Cleanup rmake.rs setup in compiletest
    
    While debugging rmake.rs tests I realized that the rmake.rs setup itself in compiletest is very messy and confused. Now that I know some of the bootstrap steps and the rmake.rs tests themselves better, I realized there are cleanups that are possible:
    
    - Rework how `source_root` and `build_root` are calculated. They should now be less fragile then before.
    - Shuffle around path calculations to make them more logically grouped and closer to eventual use site(s).
    - Cleanup executable extension calculation with `std::env::consts::EXE_EXTENSION`.
    - Cleanup various dylib search path handling: renamed variables to better reflect their purpose, minimized mutability scope of said variables.
    - Prune useless env vars passed to both `rustc` and recipe binary commands.
    - Vastly improve the documentation for the setup of rmake.rs tests, including assumed bootstrap-provided build layouts, rmake.rs test layout, dylib search paths, intended purpose of passed env vars and the `COMPILETEST_FORCE_STAGE0=1 ./x test run-make --stage 0` stage0 sysroot special handling.
    
    This PR is best reviewed commit-by-commit.
    
    Fixes rust-lang#127920.
    
    r? bootstrap (or Kobzol, or Mark, or T-compiler)
    
    try-job: aarch64-apple
    try-job: armhf-gnu
    try-job: dist-x86_64-linux
    try-job: test-various
    try-job: x86_64-mingw
    try-job: x86_64-msvc
    try-job: x86_64-gnu-llvm-18
    matthiaskrgr authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    ae28d5c View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#127975 - GuillaumeGomez:fix-trait-bounds-di…

    …splay, r=notriddle
    
    Fix trait bounds display
    
    Fixes rust-lang#127398.
    
    I took a simple rule: if there are more than two bounds, we display them like rustfmt.
    
    Before this PR:
    
    ![Screenshot from 2024-07-19 17-38-59](https://github.com/user-attachments/assets/4162b57e-7ebb-48f9-a3a1-25e443c140cb)
    
    After this PR:
    
    ![Screenshot from 2024-07-19 17-39-09](https://github.com/user-attachments/assets/a3ba22dd-5f34-45d0-ad9d-0cdf89dc509c)
    
    r? `@notriddle`
    matthiaskrgr authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    17aaba7 View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#128005 - ChrisDenton:msvc-include, r=joboet

    Remove _tls_used hack
    
    All the MSVC targets use `target_thread_locals` (see the [base spec](https://github.com/rust-lang/rust/blob/1afc5fd042f7583b9668dd62be98325487483d1c/compiler/rustc_target/src/spec/base/windows_msvc.rs#L34)) so this hack is no longer needed. The compiler will ensure that thread locals work properly.
    matthiaskrgr authored Jul 20, 2024
    Configuration menu
    Copy the full SHA
    8fe93c9 View commit details
    Browse the repository at this point in the history