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 #130519

Merged
merged 20 commits into from
Sep 18, 2024
Merged

Rollup of 5 pull requests #130519

merged 20 commits into from
Sep 18, 2024

Commits on Sep 16, 2024

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

Commits on Sep 17, 2024

  1. Adjust supertrait of ArgAbiMethods.

    It only needs `Self::Value` and `Self::Type`, so it can be a subtrait of
    `BackendTypes`. That is a smaller and simpler trait than `HasCodegen`
    (which includes `BackendTypes` and a lot more).
    nnethercote committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    47830ed View commit details
    Browse the repository at this point in the history
  2. Merge HasCodegen into BuilderMethods.

    It has `Backend` and `Deref` boudns, plus an associated type
    `CodegenCx`, and it has a single use. This commit "inlines" it into
    `BuilderMethods`, which makes the complicated backend trait situation a
    little simpler.
    nnethercote committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    5f98943 View commit details
    Browse the repository at this point in the history
  3. Remove Backend.

    It's a trait that aggregates five other traits. But consider the places
    that use it.
    - `BuilderMethods`: requires three of the five traits.
    - `CodegenMethods`: requires zero(!) of the five traits.
    - `BaseTypeMethods`: requires two of the five traits.
    - `LayoutTypeMethods`: requires three of the five traits.
    - `TypeMembershipMethods`: requires one of the five traits.
    
    This commit just removes it, which makes everything simpler.
    nnethercote committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    928d8e6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6a35b5c View commit details
    Browse the repository at this point in the history
  5. Rename {ArgAbi,IntrinsicCall}Methods.

    They both are part of `BuilderMethods`, and so should have `Builder` in
    their name like all the other traits in `BuilderMethods`.
    nnethercote committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    410a2de View commit details
    Browse the repository at this point in the history
  6. Remove unneeded bounds from CodegenMethods and BuilderMethods.

    Some of these are pulled in indirectly, e.g. `MiscMethods` via
    `TypeMethods`.
    nnethercote committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    108f8c8 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    85a4d2a View commit details
    Browse the repository at this point in the history
  8. Move some supertraits outward.

    Specifically, put them where they are genuinely required, i.e. the
    outermost place they can be.
    nnethercote committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    540fcc6 View commit details
    Browse the repository at this point in the history
  9. Rename supertraits of CodegenMethods.

    Supertraits of `BuilderMethods` are all called `XyzBuilderMethods`.
    Supertraits of `CodegenMethods` are all called `XyzMethods`. This commit
    changes the latter to `XyzCodegenMethods`, for consistency.
    nnethercote committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    a8d22eb View commit details
    Browse the repository at this point in the history
  10. Use associative type defaults in {Layout,FnAbi}OfHelpers.

    This avoids some repetitive boilerplate code.
    nnethercote committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    acb832d View commit details
    Browse the repository at this point in the history
  11. Add zlib to musl dist image so rust-lld will support zlib compression…

    … for debug info there.
    
    Fixes rust-lang#130063.
    khuey committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    930db09 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Configuration menu
    Copy the full SHA
    89f04c2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3a35288 View commit details
    Browse the repository at this point in the history
  3. doc: the source of LetStmt can also be AssignDesugar

    For example, the two following statements are desugared into a block
    whose `LetStmt` source is `AssignDesugar`:
    
    ```rust
    _ = ignoring_some_result();
    (a, b) = (b, a);
    ```
    samueltardieu committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    a47e9b6 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#130457 - nnethercote:cleanup-codegen-traits…

    …, r=bjorn3
    
    Cleanup codegen traits
    
    The traits governing codegen are quite complicated and hard to follow. This PR cleans them up a bit.
    
    r? `@bjorn3`
    matthiaskrgr authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    21313d7 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#130471 - khuey:zlib-musl, r=Kobzol

    Add zlib to musl dist image so rust-lld will support zlib compression for debug info there.
    
    Fixes rust-lang#130063.
    
    r? `@Kobzol`
    matthiaskrgr authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    3443795 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#130507 - Urgau:check-cfg-raw-keywords, r=ji…

    …eyouxu
    
    Improve handling of raw-idents in check-cfg
    
    This PR improves the handling of raw-idents in the check-cfg diagnostics.
    
    In particular the list of expected names and the suggestion now correctly take into account the "keyword-ness" of the ident, and correctly prefix the ident with `r#` when necessary.
    
    `@rustbot` labels +F-check-cfg
    matthiaskrgr authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    00c4be3 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#130509 - krasimirgg:llvm-20-2, r=nikic

    llvm-wrapper: adapt for LLVM API changes, second try
    
    This is a re-work of rust-lang#129749 after LLVM brought back the APIs used by rust.
    
    No functional changes intended.
    
    `@rustbot` label: +llvm-main
    r? `@nikic`
    cc: `@tmandry`
    matthiaskrgr authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    48b90aa View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#130510 - samueltardieu:doc-letstmt-assign-d…

    …esugar, r=compiler-errors
    
    doc: the source of `LetStmt` can also be `AssignDesugar`
    
    For example, the two following statements are desugared into a block whose `LetStmt` source is `AssignDesugar`:
    
    ```rust
    _ = ignoring_some_result();
    (a, b) = (b, a);
    ```
    matthiaskrgr authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    c0951bb View commit details
    Browse the repository at this point in the history