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

Closed
wants to merge 16 commits into from
Closed

Rollup of 5 pull requests #125079

wants to merge 16 commits into from

Commits on Jan 14, 2024

  1. Clarify prioritization alert

    fmease committed Jan 14, 2024
    Configuration menu
    Copy the full SHA
    4333fb0 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

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

Commits on May 10, 2024

  1. Configuration menu
    Copy the full SHA
    4fde241 View commit details
    Browse the repository at this point in the history
  2. remove unreachable code

    lcnr committed May 10, 2024
    Configuration menu
    Copy the full SHA
    c565a0a View commit details
    Browse the repository at this point in the history
  3. refactor winnowing

    lcnr committed May 10, 2024
    Configuration menu
    Copy the full SHA
    03d9e84 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Don't call env::set_var in rustc_driver::install_ice_hook

    Modifying an environment variable would make the function unsafe to
    call.
    tbu- committed May 13, 2024
    Configuration menu
    Copy the full SHA
    b98b8d7 View commit details
    Browse the repository at this point in the history
  2. style-guide: Format single associated type where clauses on the sam…

    …e line
    
    In particular, lifetime-generic associated types often have a
    `where Self: 'a` bound, which we can format on the same line.
    joshtriplett committed May 13, 2024
    Configuration menu
    Copy the full SHA
    3742a4b View commit details
    Browse the repository at this point in the history
  3. style-guide: Give a second example for associated type formatting

    Show an example that has bounds.
    joshtriplett committed May 13, 2024
    Configuration menu
    Copy the full SHA
    2f20bb4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2af29af View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9ff777b View commit details
    Browse the repository at this point in the history
  6. Reword formatting for where clauses

    Suggested-by: Caleb Cartwright <[email protected]>
    joshtriplett committed May 13, 2024
    Configuration menu
    Copy the full SHA
    163b1a6 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#119515 - joshtriplett:style-guide-gat-where…

    …-clause-same-line, r=compiler-errors
    
    style-guide: Format single associated type `where` clauses on the same line
    
    In particular, lifetime-generic associated types often have a
    `where Self: 'a` bound, which we can format on the same line.
    fmease authored May 13, 2024
    Configuration menu
    Copy the full SHA
    b568cc2 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#119959 - fmease:triagebot-prioritization-al…

    …ert-label, r=apiraino
    
    [meta] Clarify prioritization alert
    
    Apparently, there used to exist the label <kbd>I-nominated</kbd> judging from this entry:
    
    https://github.com/rust-lang/rust/blob/8847bda592d940ae1f34d87d8cacdc09a9f787fa/triagebot.toml#L393
    
    Since it was replaced with individual team labels, I think it makes sense to update the prioritization alert. Of course, it's not super important since the members of WG-prioritization already know that. This is just cleanup.
    
    r? apiraino or wg-prioritization
    fmease authored May 13, 2024
    Configuration menu
    Copy the full SHA
    a7b9536 View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#124532 - lcnr:elaborate-coherence, r=compil…

    …er-errors
    
    elaborate obligations in coherence
    
    The following test currently does not pass coherence:
    ```rust
    trait Super {}
    trait Sub<T>: Super {}
    
    trait Overlap<T> {}
    impl<T, U: Sub<T>> Overlap<T> for U {}
    impl<T> Overlap<T> for () {}
    
    fn main() {}
    ```
    
    We check whether `(): Sub<?t>` holds. This stalls with ambiguity as downstream crates may add an impl for `(): Sub<Local>`. However, its super trait bound `(): Super` cannot be implemented downstream, so this one is known not to hold.
    
    By elaborating the bounds in the implicit negative overlap check, this now compiles. This is necessary to prevent breakage from enabling `-Znext-solver=coherence` (rust-lang#121848), see tests/ui/coherence/super-traits/super-trait-knowable-2.rs for more details.
    
    r? `@compiler-errors`
    fmease authored May 13, 2024
    Configuration menu
    Copy the full SHA
    176741b View commit details
    Browse the repository at this point in the history
  10. Rollup merge of rust-lang#124844 - compiler-errors:shadow-probe, r=lcnr

    Use a proper probe for shadowing impl
    
    r? lcnr
    fmease authored May 13, 2024
    Configuration menu
    Copy the full SHA
    3ea4fdf View commit details
    Browse the repository at this point in the history
  11. Rollup merge of rust-lang#125063 - tbu-:pr_set_ice_hook_env, r=michae…

    …lwoerister
    
    Don't call `env::set_var` in `rustc_driver::install_ice_hook`
    
    Modifying an environment variable would make the function unsafe to call.
    fmease authored May 13, 2024
    Configuration menu
    Copy the full SHA
    8e1dc65 View commit details
    Browse the repository at this point in the history