Skip to content

rustdoc: add a couple of regression tests - #123348

Merged
bors merged 1 commit into
rust-lang:masterfrom
fmease:add-synth-auto-trait-impls-tests
Apr 2, 2024
Merged

rustdoc: add a couple of regression tests#123348
bors merged 1 commit into
rust-lang:masterfrom
fmease:add-synth-auto-trait-impls-tests

Conversation

@fmease

@fmeasefmease commented Apr 2, 2024•
edited
Loading

Copy link
Copy Markdown
Member

Fixes#114657.
Fixes#112828.
Fixes#107715.

r? rustdoc

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Apr 2, 2024
GuillaumeGomez
GuillaumeGomez reviewed Apr 2, 2024
View reviewed changes
Comment threadtests/rustdoc-ui/synthetic-auto-trait-impls/const-in-super-trait-and-item-bound.rs Outdated
@@ -0,0 +1,23 @@
// We you used to ICE here while trying to synthesize auto trait impls.

@GuillaumeGomezGuillaumeGomezApr 2, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"We you used"? 😉

GuillaumeGomez
GuillaumeGomez reviewed Apr 2, 2024
View reviewed changes
Comment threadtests/rustdoc-ui/synthetic-auto-trait-impls/lifetime-generic-user-impl-normalize.rs Outdated
GuillaumeGomez
GuillaumeGomez approved these changes Apr 2, 2024
View reviewed changes

@GuillaumeGomezGuillaumeGomez left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! r=me once typos are fixed.

@fmease
fmeaseforce-pushed the add-synth-auto-trait-impls-tests branch from 6af717a to f45eaf8CompareApril 2, 2024 10:31
@fmease

fmease commented Apr 2, 2024

Copy link
Copy Markdown
MemberAuthor

@bors r=GuillaumeGomez rollup

@bors

bors commented Apr 2, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit f45eaf8 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@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 Apr 2, 2024
@bors

bors commented Apr 2, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f45eaf8 with merge f03ff3d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 2, 2024
@bors
Auto merge ofrust-lang#123348- fmease:add-synth-auto-trait-impls-te…
f03ff3d
…sts, r=GuillaumeGomez
rustdoc: add a couple of regression tests
Fixesrust-lang#114657.
Fixesrust-lang#112828.
Fixesrust-lang#112242.
Fixesrust-lang#107715.
r? rustdoc
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors

bors commented Apr 2, 2024

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

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

fmease commented Apr 2, 2024

Copy link
Copy Markdown
MemberAuthor

o.O

@GuillaumeGomez

GuillaumeGomez commented Apr 2, 2024

Copy link
Copy Markdown
Member

Maybe it's because of changes in your other PR?

@fmease

fmease commented Apr 2, 2024•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Right, I've intentionally changed a vid_map.get(vid).unwrap_or(r) to a vid_map[vid] making rustdoc panic if rustc::AutoTraitFinder returns a region inference variable that cannot be resolved because that is really fishy. I can change it back with a FIXME: investigate which would also fix #123370 or remove the failing test from this PR and readd it once I understand rustc::AutoTraitFinder and can fix the underlying issue if there's one.

rustc::AutoTraitFinder can also return placeholder regions RePlaceholder which doesn't seem right either and which makes rustdoc ICE, too (we have a GitHub issue for that already).

@fmease

fmease commented Apr 2, 2024•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Should I implement the hot fix (single line change back to the old behavior) to fix the regressions from my simplification PR or should I postpone?

@GuillaumeGomez

GuillaumeGomez commented Apr 2, 2024

Copy link
Copy Markdown
Member

Remove the failing test from here and do the hotfix in another PR?

@fmease
fmeaseforce-pushed the add-synth-auto-trait-impls-tests branch from f45eaf8 to 5ee4d13CompareApril 2, 2024 16:38
@fmease

fmease commented Apr 2, 2024

Copy link
Copy Markdown
MemberAuthor

I've removed the failing test. Hot fix coming up in a sec.
@bors r=GuillaumeGomez

@bors

bors commented Apr 2, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 5ee4d13 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@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 Apr 2, 2024
@fmeasefmease mentioned this pull request Apr 2, 2024
Merged
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 2, 2024
@matthiaskrgr
Rollup merge ofrust-lang#123348- fmease:add-synth-auto-trait-impls-…
3c90cfa
…tests, r=GuillaumeGomez
rustdoc: add a couple of regression tests
Fixesrust-lang#114657.
Fixesrust-lang#112828.
Fixesrust-lang#107715.
r? rustdoc
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 2, 2024
@matthiaskrgr
Rollup merge ofrust-lang#123375- fmease:rustdoc-sati-re-hotfix, r=G…
f88a33c
…uillaumeGomez
rustdoc: synthetic auto trait impls: accept unresolved region vars for now
rust-lang#123348 (comment):
> Right, [in rust-lang#123340] I've intentionally changed a `vid_map.get(vid).unwrap_or(r)` to a `vid_map[vid]` making rustdoc panic if `rustc::AutoTraitFinder` returns a region inference variable that cannot be resolved because that is really fishy. I can change it back with a `FIXME: investigate` […]. [O]nce I [fully] understand [the arcane] `rustc::AutoTraitFinder` [I] can fix the underlying issue if there's one.
>
> `rustc::AutoTraitFinder` can also return placeholder regions `RePlaceholder` which doesn't seem right either and which makes rustdoc ICE, too (we have a GitHub issue for that already[, namely rust-lang#120606]).
Fixesrust-lang#123370.
Fixesrust-lang#112242.
r? `@GuillaumeGomez`
@matthiaskrgrmatthiaskrgr mentioned this pull request Apr 2, 2024
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 2, 2024
@matthiaskrgr
Rollup merge ofrust-lang#123375- fmease:rustdoc-sati-re-hotfix, r=G…
8e271d7
…uillaumeGomez
rustdoc: synthetic auto trait impls: accept unresolved region vars for now
rust-lang#123348 (comment):
> Right, [in rust-lang#123340] I've intentionally changed a `vid_map.get(vid).unwrap_or(r)` to a `vid_map[vid]` making rustdoc panic if `rustc::AutoTraitFinder` returns a region inference variable that cannot be resolved because that is really fishy. I can change it back with a `FIXME: investigate` […]. [O]nce I [fully] understand [the arcane] `rustc::AutoTraitFinder` [I] can fix the underlying issue if there's one.
>
> `rustc::AutoTraitFinder` can also return placeholder regions `RePlaceholder` which doesn't seem right either and which makes rustdoc ICE, too (we have a GitHub issue for that already[, namely rust-lang#120606]).
Fixesrust-lang#123370.
Fixesrust-lang#112242.
r? ``@GuillaumeGomez``
@matthiaskrgrmatthiaskrgr mentioned this pull request Apr 2, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 2, 2024
@bors
Auto merge ofrust-lang#123385- matthiaskrgr:rollup-v69vjbn, r=matth…
88c2f4f
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#123198 (Add fn const BuildHasherDefault::new)
- rust-lang#123226 (De-LLVM the unchecked shifts [MCP#693])
- rust-lang#123302 (Make sure to insert `Sized` bound first into clauses list)
- rust-lang#123348 (rustdoc: add a couple of regression tests)
- rust-lang#123362 (Check that nested statics in thread locals are duplicated per thread.)
- rust-lang#123368 (CFI: Support non-general coroutines)
- rust-lang#123375 (rustdoc: synthetic auto trait impls: accept unresolved region vars for now)
- rust-lang#123378 (Update sysinfo to 0.30.8)
Failed merges:
- rust-lang#123349 (Fix capture analysis for by-move closure bodies)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 464f264 into rust-lang:masterApr 2, 2024
@rustbotrustbot added this to the 1.79.0 milestone Apr 2, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 2, 2024
@rust-timer
Unrolled build forrust-lang#123375
a2c57eb
Rollup merge of rust-lang#123375 - fmease:rustdoc-sati-re-hotfix, r=GuillaumeGomez
rustdoc: synthetic auto trait impls: accept unresolved region vars for now
rust-lang#123348 (comment):
> Right, [in rust-lang#123340] I've intentionally changed a `vid_map.get(vid).unwrap_or(r)` to a `vid_map[vid]` making rustdoc panic if `rustc::AutoTraitFinder` returns a region inference variable that cannot be resolved because that is really fishy. I can change it back with a `FIXME: investigate` […]. [O]nce I [fully] understand [the arcane] `rustc::AutoTraitFinder` [I] can fix the underlying issue if there's one.
>
> `rustc::AutoTraitFinder` can also return placeholder regions `RePlaceholder` which doesn't seem right either and which makes rustdoc ICE, too (we have a GitHub issue for that already[, namely rust-lang#120606]).
Fixesrust-lang#123370.
Fixesrust-lang#112242.
r? ``@GuillaumeGomez``
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 2, 2024
@rust-timer
Unrolled build forrust-lang#123348
4d28bdd
Rollup merge of rust-lang#123348 - fmease:add-synth-auto-trait-impls-tests, r=GuillaumeGomez
rustdoc: add a couple of regression tests
Fixesrust-lang#114657.
Fixesrust-lang#112828.
Fixesrust-lang#107715.
r? rustdoc
@fmease
fmease deleted the add-synth-auto-trait-impls-tests branch April 2, 2024 23:50
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.79.0

5 participants

@fmease@bors@rust-log-analyzer@GuillaumeGomez@rustbot