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 5 pull requests #125665

Merged
merged 16 commits into from
May 28, 2024
Merged

Rollup of 5 pull requests #125665

merged 16 commits into from
May 28, 2024

Commits on May 10, 2024

  1. NVPTX: Avoid PassMode::Direct for args in C abi

    Kjetil Kjeka committed May 10, 2024
    Configuration menu
    Copy the full SHA
    ead02ba View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. Configuration menu
    Copy the full SHA
    f63931b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    19cfe8d View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

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

Commits on May 28, 2024

  1. Remove out-of-date comment.

    This comment -- "by default we ignore everything in the repository" --
    was added in rust-lang#65939 when rustfmt was first being introduced for this
    repository and (briefly) every directory was ignored. Since then lots of
    directories have opted in to formatting, so it is no longer true.
    nnethercote committed May 28, 2024
    Configuration menu
    Copy the full SHA
    bcfa67d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5673337 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    404d47e View commit details
    Browse the repository at this point in the history
  4. Fix comments.

    Some are too long, some aren't complete sentences, some are complete
    sentences but don't bother with an upper case letter at the start. All
    annoying and hurt readability.
    nnethercote committed May 28, 2024
    Configuration menu
    Copy the full SHA
    4702a1c View commit details
    Browse the repository at this point in the history
  5. Don't format tests/run-make/*/rmake.rs.

    It's reasonable to want to, but in the current implementation this
    causes multiple problems.
    
    - All the `rmake.rs` files are formatted every time even when they
      haven't changed. This is because they get whitelisted unconditionally
      in the `OverrideBuilder`, before the changed files get added.
    
    - The way `OverrideBuilder` works, if any files gets whitelisted then no
      unmentioned files will get traversed. This is surprising, and means
      that the `rmake.rs` entries broke the use of explicit paths to `x
      fmt`, and also broke `GITHUB_ACTIONS=true git check --fmt`.
    
    The commit removes the `rmake.rs` entries, fixes the formatting of a
    couple of files that were misformatted (not previously caught due to the
    `GITHUB_ACTIONS` breakage), and bans `!`-prefixed entries in
    `rustfmt.toml` because they cause all these problems.
    nnethercote committed May 28, 2024
    Configuration menu
    Copy the full SHA
    f1b0ca0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    50a5da1 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f494036 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#117671 - kjetilkjeka:nvptx_c_abi_avoid_dire…

    …ct, r=davidtwco
    
    NVPTX: Avoid PassMode::Direct for args in C abi
    
    Fixes rust-lang#117480
    
    I must admit that I'm confused about `PassMode` altogether, is there a good sum-up threads for this anywhere? I'm especially confused about how "indirect" and "byval" goes together. To me it seems like "indirect" basically means "use a indirection through a pointer", while "byval" basically means "do not use indirection through a pointer".
    
    The return used to keep `PassMode::Direct` for small aggregates. It turns out that `make_indirect` messes up the tests and one way to fix it is to keep `PassMode::Direct` for all aggregates. I have mostly seen this PassMode mentioned for args. Is it also a problem for returns? When experimenting with `byval` as an alternative i ran into [this assert](https://github.com/rust-lang/rust/blob/61a3eea8043cc1c7a09c2adda884e27ffa8a1172/compiler/rustc_codegen_llvm/src/abi.rs#L463C22-L463C22)
    
    I have added tests for the same kind of types that is already tested for the "ptx-kernel" abi. The tests cannot be enabled until something like rust-lang#117458 is completed and merged.
    
    CC: ``@RalfJung`` since you seem to be the expert on this and have already helped me out tremendously
    
    CC: ``@RDambrosio016`` in case this influence your work on `rustc_codegen_nvvm`
    
    ``@rustbot`` label +O-NVPTX
    matthiaskrgr committed May 28, 2024
    Configuration menu
    Copy the full SHA
    713c852 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#125573 - GuillaumeGomez:migrate-allow-warni…

    …ngs-cmdline-stability, r=jieyouxu
    
    Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`
    
    Part of rust-lang#121876.
    
    r? ``@jieyouxu``
    matthiaskrgr committed May 28, 2024
    Configuration menu
    Copy the full SHA
    78b4caf View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#125590 - ChrisDenton:mingw-ci-3, r=Kobzol

    Add a "Setup Python" action for github-hosted runners and remove unnecessary `CUSTOM_MINGW` environment variable
    
    The Setup Python action isn't strictly necessary ([even on Windows](rust-lang#125584)) but it is [recommend by GitHub](https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#specifying-a-python-version).
    
    The `CUSTOM_MINGW` environment variable is redundant now as it's always set for mingw and always unset otherwise.
    
    try-job: x86_64-mingw
    try-job: x86_64-mingw
    try-job: dist-x86_64-msvc
    try-job: dist-x86_64-mingw
    matthiaskrgr committed May 28, 2024
    Configuration menu
    Copy the full SHA
    86f6fae View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#125598 - compiler-errors:proof-tree-builder…

    …, r=lcnr
    
    Make `ProofTreeBuilder` actually generic over `Interner`
    
    Self-explanatory. Also renamed `ecx.tcx()` to `ecx.interner()`.
    
    r? lcnr
    matthiaskrgr committed May 28, 2024
    Configuration menu
    Copy the full SHA
    de2bf36 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#125637 - nnethercote:rustfmt-fixes, r=Guill…

    …aumeGomez
    
    rustfmt fixes
    
    The `rmake.rs` entries in `rustfmt.toml` are causing major problems for `x fmt`. This PR removes them and does some minor related cleanups.
    
    r? ``@GuillaumeGomez``
    matthiaskrgr committed May 28, 2024
    Configuration menu
    Copy the full SHA
    faabc74 View commit details
    Browse the repository at this point in the history