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 7 pull requests #125120

Merged
merged 21 commits into from
May 14, 2024
Merged

Rollup of 7 pull requests #125120

merged 21 commits into from
May 14, 2024

Commits on May 12, 2024

  1. Configuration menu
    Copy the full SHA
    f2de5fb View commit details
    Browse the repository at this point in the history
  2. make tidy happy

    Oneirical committed May 12, 2024
    Configuration menu
    Copy the full SHA
    a1b5ea0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    71fd2cf View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Configuration menu
    Copy the full SHA
    2e4c90c View commit details
    Browse the repository at this point in the history
  2. Uplift AliasTy

    compiler-errors committed May 14, 2024
    Configuration menu
    Copy the full SHA
    1ad28a6 View commit details
    Browse the repository at this point in the history
  3. Remove to_term

    compiler-errors committed May 14, 2024
    Configuration menu
    Copy the full SHA
    9f8cdb2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    45b50d3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8f97a25 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    dbd2ca6 View commit details
    Browse the repository at this point in the history
  7. style-guide: When breaking binops handle multi-line first operand better

    Use the indentation of the *last* line of the first operand, not the first.
    
    Fixes rust-lang/style-team#189
    joshtriplett committed May 14, 2024
    Configuration menu
    Copy the full SHA
    57c32a1 View commit details
    Browse the repository at this point in the history
  8. Fix missing word

    Co-authored-by: Caleb Cartwright <[email protected]>
    joshtriplett and calebcartwright committed May 14, 2024
    Configuration menu
    Copy the full SHA
    e2d9c0d View commit details
    Browse the repository at this point in the history
  9. Wording improvement

    Co-authored-by: Caleb Cartwright <[email protected]>
    joshtriplett and calebcartwright committed May 14, 2024
    Configuration menu
    Copy the full SHA
    e098eb1 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    f97d915 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    ade33b0 View commit details
    Browse the repository at this point in the history
  12. Rollup merge of rust-lang#119838 - joshtriplett:style-guide-binop-ind…

    …ent, r=compiler-errors
    
    style-guide: When breaking binops handle multi-line first operand better
    
    Use the indentation of the *last* line of the first operand, not the first.
    
    Fixes rust-lang/style-team#189
    compiler-errors authored May 14, 2024
    Configuration menu
    Copy the full SHA
    3628783 View commit details
    Browse the repository at this point in the history
  13. Rollup merge of rust-lang#124844 - compiler-errors:shadow-probe, r=lcnr

    Use a proper probe for shadowing impl
    
    r? lcnr
    compiler-errors authored May 14, 2024
    Configuration menu
    Copy the full SHA
    0458d8a View commit details
    Browse the repository at this point in the history
  14. Rollup merge of rust-lang#125047 - Oneirical:test5, r=jieyouxu

    Migrate `run-make/issue-14500` to new `rmake.rs` format
    
    Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).
    
    Note: I find suspicious that `libbar.a` is hardcoded and is not using the `STATICLIB` call to adapt to Windows platforms. Is this intentional? If not, this will need to be changed.
    compiler-errors authored May 14, 2024
    Configuration menu
    Copy the full SHA
    844c7e8 View commit details
    Browse the repository at this point in the history
  15. Rollup merge of rust-lang#125080 - bvanjoi:fix-124946, r=nnethercote

    only find segs chain for missing methods when no available candidates
    
    Fixes rust-lang#124946
    
    This PR includes two changes:
    - Extracting the lookup for the missing method in chains into a single function.
    - Calling this function only when there are no candidates available.
    compiler-errors authored May 14, 2024
    Configuration menu
    Copy the full SHA
    8c64acd View commit details
    Browse the repository at this point in the history
  16. Rollup merge of rust-lang#125088 - compiler-errors:uplift-alias-ty, r…

    …=lcnr
    
    Uplift `AliasTy` and `AliasTerm`
    
    Follow-up from rust-lang#125076.
    
    r? lcnr
    compiler-errors authored May 14, 2024
    Configuration menu
    Copy the full SHA
    712e7c3 View commit details
    Browse the repository at this point in the history
  17. Rollup merge of rust-lang#125100 - compiler-errors:faster, r=nnethercote

    Don't do post-method-probe error reporting steps if we're in a suggestion
    
    Currently in method probing, if we fail to pick a method, then we reset and try to collect relevant candidates for method errors:
    
    https://github.com/rust-lang/rust/blob/34582118afaf00b0eb2d209a90b181c7156b501c/compiler/rustc_hir_typeck/src/method/probe.rs#L953-L993
    
    However, we do method lookups via `lookup_method_for_diagnostic` and only care about the result if the method probe was a *success*.
    
    Namely, we don't need to do a bunch of other lookups on failure, since we throw away these results anyways, such as an expensive call to:
    
    https://github.com/rust-lang/rust/blob/34582118afaf00b0eb2d209a90b181c7156b501c/compiler/rustc_hir_typeck/src/method/probe.rs#L959
    
    And:
    https://github.com/rust-lang/rust/blob/34582118afaf00b0eb2d209a90b181c7156b501c/compiler/rustc_hir_typeck/src/method/probe.rs#L985
    
    ---
    
    This PR also renames some methods so it's clear that they're for diagnostics.
    
    r? `@nnethercote`
    compiler-errors authored May 14, 2024
    Configuration menu
    Copy the full SHA
    d59f430 View commit details
    Browse the repository at this point in the history
  18. Rollup merge of rust-lang#125118 - GuillaumeGomez:cleanup-run-make, r…

    …=jieyouxu
    
    Use new utility functions/methods in run-make tests
    
    Little cleanup using new functions/methods I added into the `run-make-support` library.
    
    r? `@jieyouxu`
    compiler-errors authored May 14, 2024
    Configuration menu
    Copy the full SHA
    31016d5 View commit details
    Browse the repository at this point in the history