Rollup of 6 pull requests #98144
Closed
Rollup of 6 pull requests #98144
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously we were suggesting stuff like `fn f( &u32) {}`
To avoid circular link time dependency between core and compiler builtins when building with `-Zshare-generics`.
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
…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`
…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``
…=Amanieu Inline `const_eval_select` To avoid circular link time dependency between core and compiler builtins when building with `-Zshare-generics`. r? ``@Amanieu``
…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:  ). This PR fixes it and adds a GUI test to prevent another regression. r? ``@notriddle``
…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`
…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>
rustbot
added
T-compiler
|
@bors r+ rollup=never p=6 |
|
📌 Commit 0a29cad has been approved by |
bors
added
the
S-waiting-on-bors
|
⌛ Testing commit 0a29cad with merge cbfc8c1f44f105dff7040b2d8d859015bd8546af... |
|
💔 Test failed - checks-actions |
bors
removed
the
S-waiting-on-bors
bors
added
the
S-waiting-on-review
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
@bors retry |
bors
added
S-waiting-on-bors
|
Isn't it a valid failure? This has some rustdoc PRs and I thought it was related to one of them, created #98152 to see it. |
|
⌛ Testing commit 0a29cad with merge faa5b8ec12e420b59421407e6e229f19f4f7a57e... |
|
@bors retry r- |
bors
added
S-waiting-on-author
|
Seems that failure happened several times in the past, opened #98163 to track. Sorry for misunderstanding! |
|
No problem, thanks for opening the issue. ;) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
&a: Tparameters #97964 (Fix suggestions for&a: Tparameters)const_eval_select#98059 (Inlineconst_eval_select)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup