Fix rustdoc duplicated blanket impls by GuillaumeGomez · Pull Request #96091 · rust-lang/rust

GuillaumeGomez · 2022-04-15T19:54:27Z

Fixes#96036.

I think it'll not be great performance-wise but I couldn't find another way to prevent that unfortunately...

r? @notriddle

GuillaumeGomez · 2022-04-15T19:54:53Z

@bors try @rust-timer queue

rust-timer · 2022-04-15T19:54:54Z

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

bors · 2022-04-15T19:55:01Z

⌛ Trying commit 0ef6967560e9c07aa81ddcda731e16eb8e5db8ed with merge 423efbc30a40067e7710e64b2381817f976e764c...

vacuus · 2022-04-15T21:04:23Z

I don't actually know that this works, but can't you use a FxHashSet<DefId> for impl_ids? You don't seem to check which set did maps to, just whether it's contained within that set, so the nesting seems unnecessary.

Unrelated, but it would be nice to use the stabilized format_args_capture feature (having the identifier in the braces) for the panic invocation.

GuillaumeGomez · 2022-04-15T21:10:46Z

Unfortunately, no. The DefId in the FxHashMap is the item and it lists all its implementations. So we cannot only have one level, otherwise we'd have much less implementations.

For the fun fact: I also thought the same as you first. The tests disagreed strongly. 😆

notriddle · 2022-04-15T21:36:52Z

Overall the approach is okay to me. It's just nitpicking about specifics: why so much of the moral equivalent of unwrap?

GuillaumeGomez · 2022-04-15T21:38:36Z

It's not that I don't want unwrap equivalents but more than I actually thought it would turn out better this way. Let's see how it'll go in the other way around. :)

bors · 2022-04-15T21:45:23Z

☀️ Try build successful - checks-actions
Build commit: 423efbc30a40067e7710e64b2381817f976e764c (423efbc30a40067e7710e64b2381817f976e764c)

rust-timer · 2022-04-15T21:45:24Z

Queued 423efbc30a40067e7710e64b2381817f976e764c with parent 1e6fe58, future comparison URL.

GuillaumeGomez · 2022-04-15T22:22:34Z

Applied @notriddle's suggestions. :)

Fixesrust-lang#96036 This is a different approach than rust-lang#96091, an approach that should have less performance impact.

rust-timer · 2022-04-16T00:46:18Z

Finished benchmarking commit (423efbc30a40067e7710e64b2381817f976e764c): comparison url.

Summary:

Primary benchmarks: 🎉 relevant improvement found
Secondary benchmarks: 🎉 relevant improvements found

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	0	1	1	6	1
mean²	N/A	0.3%	-0.8%	-1.0%	-0.8%
max	N/A	0.3%	-0.8%	-1.2%	-0.8%

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf -perf-regression

number of relevant changes↩
the arithmetic mean of the percent change↩

notriddle · 2022-04-16T03:26:44Z

@bors r+

bors · 2022-04-16T03:26:46Z

📌 Commit 26e905b9f2c8fd76a4e3e885c37fcf6a8acd8632 has been approved by notriddle

…id, r=notriddle rustdoc: Rename `def_id` into `item_id` when the type is `ItemId` for readability As `@notriddle` mentioned in rust-lang#96091, the field name is inaccurate. This PR fixes it by renaming it accordingly to its real type. r? `@notriddle`

bors · 2022-04-17T15:53:27Z

⌛ Testing commit 26e905b9f2c8fd76a4e3e885c37fcf6a8acd8632 with merge bccc58c250e6d7f5676aca060726ba12e64c969e...

bors · 2022-04-17T15:58:26Z

💔 Test failed - checks-actions

GuillaumeGomez · 2022-04-17T15:59:49Z

Needs to be rebased.

GuillaumeGomez · 2022-04-17T18:02:54Z

@bors r=notriddle

bors · 2022-04-17T18:02:55Z

📌 Commit 6d10fd0 has been approved by notriddle

bors · 2022-04-17T18:14:19Z

⌛ Testing commit 6d10fd0 with merge ad4e98e...

bors · 2022-04-17T20:32:02Z

☀️ Test successful - checks-actions
Approved by: notriddle
Pushing ad4e98e to master...

rust-timer · 2022-04-17T23:09:50Z

Finished benchmarking commit (ad4e98e): comparison url.

Summary:

Primary benchmarks: no relevant changes found
Secondary benchmarks: mixed results

	Regressions 😿 (primary)	Regressions 😿 (secondary)	Improvements 🎉 (primary)	Improvements 🎉 (secondary)	All 😿 🎉 (primary)
count¹	0	3	0	3	0
mean²	N/A	1.1%	N/A	-1.1%	N/A
max	N/A	1.2%	N/A	-1.1%	N/A

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

number of relevant changes↩
the arithmetic mean of the percent change↩

pnkfelix · 2022-04-21T02:56:48Z

Visiting for weekly performance triage.

The main hit is to externs, which I'm rejecting as ignorable this week due to extant noise.

@rustbot label: +perf-regression-triaged

rust-highfive assigned notriddle Apr 15, 2022

rustbot added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Apr 15, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 15, 2022

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 15, 2022

notriddle requested changes Apr 15, 2022
View reviewed changes

Comment threadsrc/librustdoc/formats/mod.rs Outdated
Comment threadsrc/librustdoc/formats/cache.rs Outdated

GuillaumeGomez force-pushed the duplicated-blanket-impls branch from 0ef6967 to 26e905bCompare April 15, 2022 22:22

notriddle added a commit to notriddle/rust that referenced this pull request Apr 15, 2022
rustdoc: fix duplicate blanket impls
0e853d1
Fixesrust-lang#96036 This is a different approach than rust-lang#96091, an approach that should have less performance impact.

notriddle mentioned this pull request Apr 15, 2022
rustdoc: fix duplicate blanket impls #96095
Closed

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 16, 2022

bors 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 16, 2022

GuillaumeGomez mentioned this pull request Apr 16, 2022
rustdoc: Rename def_id into item_id when the type is ItemId for readability #96118
Merged

bors 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 17, 2022

GuillaumeGomez added 2 commits April 17, 2022 18:04

Fix rustdoc duplicated blanket impls issue
caa770a

Add regression test for rustdoc duplicated blanket impls
6d10fd0

GuillaumeGomez force-pushed the duplicated-blanket-impls branch from 26e905b to 6d10fd0Compare April 17, 2022 16:04

This comment has been minimized.
Sign in to view

bors 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 17, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 17, 2022

bors merged commit ad4e98e into rust-lang:masterApr 17, 2022

rustbot added this to the 1.62.0 milestone Apr 17, 2022

GuillaumeGomez deleted the duplicated-blanket-impls branch April 17, 2022 20:33

rustbot added the perf-regression Performance regression. label Apr 17, 2022

rustbot added the perf-regression-triaged The performance regression has been triaged. label Apr 21, 2022

rylev mentioned this pull request Apr 25, 2022
Change deserves_attention algorithm rust-lang/rustc-perf#1309
Merged

dwrensha mentioned this pull request Oct 6, 2022
Region parameter out of range when substituting in region #102751
Closed

fmease mentioned this pull request Jan 23, 2024
impl<S> Trait<Struct> for S {} blanket impl shows up multiple times in docs for Struct#81483
Closed

Uh oh!

Uh oh!

Conversation

GuillaumeGomez commented Apr 15, 2022

Uh oh!

GuillaumeGomez commented Apr 15, 2022

Uh oh!

rust-timer commented Apr 15, 2022

Uh oh!

bors commented Apr 15, 2022

Uh oh!

vacuus commented Apr 15, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented Apr 15, 2022

Uh oh!

Uh oh!

Uh oh!

notriddle commented Apr 15, 2022

Uh oh!

GuillaumeGomez commented Apr 15, 2022

Uh oh!

bors commented Apr 15, 2022

Uh oh!

rust-timer commented Apr 15, 2022

Uh oh!

GuillaumeGomez commented Apr 15, 2022

Uh oh!

rust-timer commented Apr 16, 2022

Footnotes

Uh oh!

notriddle commented Apr 16, 2022

Uh oh!

bors commented Apr 16, 2022

Uh oh!

bors commented Apr 17, 2022

Uh oh!

bors commented Apr 17, 2022

Uh oh!

GuillaumeGomez commented Apr 17, 2022

Uh oh!

This comment has been minimized.

GuillaumeGomez commented Apr 17, 2022

Uh oh!

bors commented Apr 17, 2022

Uh oh!

bors commented Apr 17, 2022

Uh oh!

bors commented Apr 17, 2022

Uh oh!

rust-timer commented Apr 17, 2022

Footnotes

Uh oh!

pnkfelix commented Apr 21, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

vacuus commented Apr 15, 2022•
edited
Loading