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

Closed
wants to merge 19 commits into from

Commits on Jun 10, 2022

  1. Fix suggestions for &a: T parameters

    Previously we were suggesting stuff like `fn f( &u32) {}`
    WaffleLapkin committed Jun 10, 2022
    Configuration menu
    Copy the full SHA
    e9d49b2 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2022

  1. Configuration menu
    Copy the full SHA
    2411692 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    451e030 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dc2977e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    33ccd76 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a752f82 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    99cd9ca View commit details
    Browse the repository at this point in the history
  7. Inline const_eval_select

    To avoid circular link time dependency between core and compiler
    builtins when building with `-Zshare-generics`.
    tmiasko committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    8a8404b View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2022

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

Commits on Jun 15, 2022

  1. Add regression test for rust-lang#93775

    Signed-off-by: Yuki Okushi <jtitor@2k36.org>
    JohnTitor committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    5028d20 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9aa1ccd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    713578b View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#97964 - WaffleLapkin:fix_borrow_par_suggest…

    …ions, r=compiler-errors
    
    Fix suggestions for `&a: T` parameters
    
    I've accidentally discovered that we have broken suggestions for `&a: T` parameters:
    ```rust
    fn f(&mut bar: u32) {}
    
    fn main() {
        let _ = |&mut a| ();
    }
    ```
    ```text
    error[E0308]: mismatched types
     --> ./t.rs:1:6
      |
    1 | fn f(&mut bar: u32) {}
      |      ^^^^^^^^-----
      |      |         |
      |      |         expected due to this
      |      expected `u32`, found `&mut _`
      |      help: did you mean `bar`: `&u32`
      |
      = note:           expected type `u32`
              found mutable reference `&mut _`
    
    error[E0308]: mismatched types
     --> ./t.rs:4:23
      |
    4 |     let _: fn(u32) = |&mut a| ();
      |                       ^^^^^--
      |                       |    |
      |                       |    expected due to this
      |                       expected `u32`, found `&mut _`
      |                       help: did you mean `a`: `&u32`
      |
      = note:           expected type `u32`
              found mutable reference `&mut _`
    ```
    
    It's hard to see, but
    1. The help span is overlapping with "expected" spans
    2. It suggests `fn f( &u32) {}` (no `mut` and lost parameter name) and `|&u32 ()` (no closing `|` and lost parameter name)
    
    I've tried to fix this.
    
    r? `@compiler-errors`
    GuillaumeGomez committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    2a8abe6 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#98053 - GuillaumeGomez:fix-generic-impl-jso…

    …n-ice, r=notriddle
    
    Fix generic impl rustdoc json output
    
    Fixes rust-lang#97986.
    
    The problem in case of generic trait impl is that the trait's items are the same for all the types afterward. But since they're the same, it's safe for rustdoc-json to just ignore them.
    
    A little representation of what's going on:
    
    ```rust
    trait T {
        fn f(); // <- defid 0
    }
    
    impl<Y> T for Y {
        fn f() {} // <- defid 1
    }
    
    struct S; // <- defid 1 (since it matches `impl<Y> T for Y`
    ```
    
    cc ``@Urgau``
    
    r? ``@CraftSpider``
    GuillaumeGomez committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    046ff35 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#98059 - tmiasko:inline-const-eval-select, r…

    …=Amanieu
    
    Inline `const_eval_select`
    
    To avoid circular link time dependency between core and compiler
    builtins when building with `-Zshare-generics`.
    
    r? ``@Amanieu``
    GuillaumeGomez committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    143fa5e View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#98092 - GuillaumeGomez:fix-sidebar-items-ex…

    …pand-collapse, r=notriddle
    
    Fix sidebar items expand collapse
    
    The collapse/expand event was not working for the items in the source code viewer sidebar (talking about these items:
    
    ![Screenshot from 2022-06-14 11-21-58](https://user-images.githubusercontent.com/3050060/173543346-af056928-e921-458f-b918-60f6fd0ecbde.png)
    
    ).
    
    This PR fixes it and adds a GUI test to prevent another regression.
    
    r? ``@notriddle``
    GuillaumeGomez committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    ca3b4c6 View commit details
    Browse the repository at this point in the history
  8. Rollup merge of rust-lang#98108 - SpriteOvO:doc_auto_cfg-feature-rmv-…

    …fix, r=notriddle,GuillaumeGomez
    
    Rustdoc: Fix stab disappearing and exclude cfg "doc" and "doctest"
    
    Fixes rust-lang#98065 Context: rust-lang#43781 (comment)
    
    r? `@GuillaumeGomez`
    GuillaumeGomez committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    bb3d1ad View commit details
    Browse the repository at this point in the history
  9. Rollup merge of rust-lang#98135 - JohnTitor:issue-93022-93775, r=comp…

    …iler-errors
    
    Add regression test for rust-lang#93775
    
    Closes rust-lang#93775, also closes rust-lang#93022 as it should have the same root cause
    r? ``@compiler-errors``
    
    Signed-off-by: Yuki Okushi <jtitor@2k36.org>
    GuillaumeGomez committed Jun 15, 2022
    Configuration menu
    Copy the full SHA
    0a29cad View commit details
    Browse the repository at this point in the history