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 6 pull requests #113968

Merged
merged 15 commits into from
Jul 22, 2023
Merged

Rollup of 6 pull requests #113968

merged 15 commits into from
Jul 22, 2023

Commits on Jun 28, 2023

  1. Configuration menu
    Copy the full SHA
    8621285 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0f7ef1a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d1ab6c2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    8745ae2 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2023

  1. Configuration menu
    Copy the full SHA
    c0156f1 View commit details
    Browse the repository at this point in the history
  2. Remove Scope::Elision.

    cjgillot committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    b8701ff View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ffa4b6f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d4ce83c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e320112 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#112508 - compiler-errors:trait-sig-lifetime…

    …-sugg-ice, r=cjgillot
    
    Tweak spans for self arg, fix borrow suggestion for signature mismatch
    
    1. Adjust a suggestion message that was annoying me
    2. Fix rust-lang#112503 by recording the right spans for the `self` part of the `&self` 0th argument
    3. Remove the suggestion for adjusting a trait signature on type mismatch, bc that's gonna probably break all the other impls of the trait even if it fixes its one usage 😅
    matthiaskrgr authored Jul 22, 2023
    Configuration menu
    Copy the full SHA
    0ed5f09 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#113901 - compiler-errors:only-bidi-norm, r=…

    …lcnr
    
    Get rid of subst-relate incompleteness in new solver
    
    We shouldn't need subst-relate if we have bidirectional-normalizes-to in the new solver.
    
    The only potential issue may happen if we have an unconstrained projection like `<Wrapper<?0> as Trait>::Assoc == <Wrapper<T> as Trait>::Assoc` where they both normalize to something that doesn't mention any substs, which would possibly prefer `?0 = T` if we fall back to subst-relate. But I'd prefer if we remove incompleteness until we can determine some case where we need them, and the bidirectional-normalizes-to seems better to have in general.
    
    I can update rust-lang/trait-system-refactor-initiative#26 and rust-lang/trait-system-refactor-initiative#25 once this lands.
    
    r? `@lcnr`
    matthiaskrgr authored Jul 22, 2023
    Configuration menu
    Copy the full SHA
    8f4b81b View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#113948 - chenyukang:yukang-fix-113178-boots…

    …trap, r=clubby789
    
    Fix rustc-args passing issue in bootstrap
    
    Fixes rust-lang#113178, r? `@jyn514`
    matthiaskrgr authored Jul 22, 2023
    Configuration menu
    Copy the full SHA
    3c83eab View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#113950 - cjgillot:clean-resolve, r=jackh726

    Remove Scope::Elision from bound-vars resolution.
    
    This scope is a remnant of HIR-based lifetime resolution.
    
    It's only role was to ensure that object lifetime resolution falled back to `'static`. This can be done using `ObjectLifetimeDefault` scope.
    matthiaskrgr authored Jul 22, 2023
    Configuration menu
    Copy the full SHA
    00e1475 View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#113957 - Urgau:regression-test-issue-113941…

    …, r=dtolnay
    
    Add regression test for issue rust-lang#113941 - naive layout isn't refined
    
    This PR adds a regression test for issue rust-lang#113941 - `the naive layout isn't refined by the actual layout` based on the minimized repro rust-lang#113941 (comment).
    matthiaskrgr authored Jul 22, 2023
    Configuration menu
    Copy the full SHA
    b7183bd View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#113959 - GuillaumeGomez:migrate-gui-test-co…

    …lor-22, r=notriddle
    
    Migrate GUI colors test to original CSS color format
    
    Follow-up of rust-lang#111459.
    
    r? `@notriddle`
    matthiaskrgr authored Jul 22, 2023
    Configuration menu
    Copy the full SHA
    5215343 View commit details
    Browse the repository at this point in the history