Skip to content

Rollup of 6 pull requests - #98144

Closed
GuillaumeGomez wants to merge 19 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-jzepepj
Closed

Rollup of 6 pull requests#98144
GuillaumeGomez wants to merge 19 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-jzepepj

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkinand others added 19 commits June 10, 2022 23:43
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
Fixesrust-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:
![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``
…fix, r=notriddle,GuillaumeGomez
Rustdoc: Fix stab disappearing and exclude cfg "doc" and "doctest"
Fixesrust-lang#98065 Context: rust-lang#43781 (comment)
r? `@GuillaumeGomez`
…iler-errors
Add regression test for rust-lang#93775Closesrust-lang#93775, also closesrust-lang#93022 as it should have the same root cause
r? ``@compiler-errors``
Signed-off-by: Yuki Okushi <jtitor@2k36.org>
@rustbotrustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 15, 2022
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r+ rollup=never p=6

@bors

bors commented Jun 15, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 0a29cad has been approved by GuillaumeGomez

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 15, 2022
@bors

bors commented Jun 15, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0a29cad with merge cbfc8c1f44f105dff7040b2d8d859015bd8546af...

@bors

bors commented Jun 15, 2022

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 15, 2022
@borsbors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 15, 2022
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job x86_64-gnu-tools failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
.......... (60/64)
... (64/64)
/checkout/src/test/rustdoc-gui/search-tab-change-title-fn-sig.goml search-tab-change-title-fn-sig... FAILED
[ERROR] (line 6) Error: The following CSS selector "#titles" was not found: for command `wait-for: "#titles"`
Build completed unsuccessfully in 0:00:47

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors retry

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 15, 2022
@JohnTitor

Copy link
Copy Markdown
Member

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.

@bors

bors commented Jun 16, 2022

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0a29cad with merge faa5b8ec12e420b59421407e6e229f19f4f7a57e...

@JohnTitor

Copy link
Copy Markdown
Member

@bors retry r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 16, 2022
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)

@JohnTitor

Copy link
Copy Markdown
Member

Seems that failure happened several times in the past, opened #98163 to track. Sorry for misunderstanding!

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

No problem, thanks for opening the issue. ;)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-libsRelevant to the library team, which will review and decide on the PR/issue.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@GuillaumeGomez@bors@rust-log-analyzer@JohnTitor@rustbot@Dylan-DPC@WaffleLapkin@tmiasko@SpriteOvO