Remove some function fields#80883

GuillaumeGomez · 2021-01-10T17:44:49Z

Same kind as #80845.

This PR removes the all_types and ret_types from the clean::Function type.

Another change that I had to do was implementing the From trait to be able to convert hir::def::DefKind into clean::TypeKind without requiring DocContext (and so I updated the clean method so that it's taken into account).

The last two commits improve a bit the get_real_types function and the Type::generics method.

r? @jyn514

GuillaumeGomez · 2021-01-10T22:14:51Z

Let's check the perf results too while we're at it.

@bors try @rust-timer queue

rust-timer · 2021-01-10T22:14:53Z

Awaiting bors try build completion.

bors · 2021-01-10T22:15:05Z

⌛ Trying commit 38100f17d2ad1a3c9f177abf49b0f1e50eb61c1e with merge 1977d4945b2c970bc1d8b2849d0eeb0d0cbb8e24...

bors · 2021-01-10T23:04:57Z

☀️ Try build successful - checks-actions
Build commit: 1977d4945b2c970bc1d8b2849d0eeb0d0cbb8e24 (1977d4945b2c970bc1d8b2849d0eeb0d0cbb8e24)

rust-timer · 2021-01-10T23:04:59Z

Queued 1977d4945b2c970bc1d8b2849d0eeb0d0cbb8e24 with parent 080ee6f, future comparison URL.

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

rust-timer · 2021-01-11T01:25:36Z

Finished benchmarking try commit (1977d4945b2c970bc1d8b2849d0eeb0d0cbb8e24): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

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

GuillaumeGomez · 2021-01-11T09:58:37Z

Interesting:

instructions: between -1% and -2.7%
memory: between -0.7% and -4.5%

Much better than what I expected.

jyn514 · 2021-01-11T18:20:10Z

@camelid would you like to review the change?

camelid

Here's a few comments.

src/librustdoc/formats/cache.rs

src/librustdoc/formats/renderer.rs

src/librustdoc/clean/types.rs

camelid · 2021-01-11T21:16:26Z

@camelid would you like to review the change?

I don't think I have enough knowledge of this code to be the reviewer, but I did leave a few comments.

src/librustdoc/clean/mod.rs

src/librustdoc/clean/types.rs

src/librustdoc/formats/cache.rs

src/librustdoc/html/render/cache.rs

src/librustdoc/formats/cache.rs

bors · 2021-01-21T16:23:42Z

☔ The latest upstream changes (presumably #81240) made this pull request unmergeable. Please resolve the merge conflicts.

GuillaumeGomez · 2021-01-28T15:26:32Z

I made the PR back from the start based on the lastest developments. No more need for TyCtxt in Cache in the end, so that's quite positive. :)

Confirming that the performance improvement is still there:

@bors try @rust-timer queue

rust-timer · 2021-01-28T15:26:36Z

Awaiting bors try build completion.

bors · 2021-01-28T15:26:45Z

⌛ Trying commit 4c2c0b152785a5826fd45430d7f6e3f087271cd9 with merge bdc8ba6d71c33ac2e37bb4e7da6544dde3d300d3...

GuillaumeGomez · 2021-02-05T16:53:07Z

Rebased.

ollie27 · 2021-02-06T09:56:15Z

There is some good cleanup here but as I've tried to say the get_index_search_type doesn't need the cache or tcx arguments. I guess they can be removed in a follow up though.

@bors r+

bors · 2021-02-06T09:56:17Z

📌 Commit c92b161 has been approved by ollie27

bors · 2021-02-06T10:46:56Z

⌛ Testing commit c92b161 with merge 6dd633a726a1900af8a4c6a769809093b6cf3aa1...

bors · 2021-02-06T15:01:56Z

💥 Test timed out

rust-log-analyzer · 2021-02-06T15:17:36Z

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

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

GuillaumeGomez · 2021-02-06T15:36:10Z

@bors retry

bors · 2021-02-06T20:55:41Z

⌛ Testing commit c92b161 with merge a73c2e5...

bors · 2021-02-06T23:44:35Z

☀️ Test successful - checks-actions
Approved by: ollie27
Pushing a73c2e5 to master...

…=jyn514 Remove is_spotlight field from `Trait` Small PR, only the last commit is relevant here. The rest is coming from rust-lang#80883 because I need the `TyCtxt` stored inside `Cache`. The point is to make ItemKind looks as close as possible to the compiler type so that it makes the switch simpler (which is why I make all these "small" PRs). r? `@jyn514`

Based on rust-lang#80883 (comment). The `tcx` parameters do seem to be used though, so I only removed the `cache` parameters.

rust-highfive assigned jyn514 Jan 10, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 10, 2021

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 10, 2021

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 11, 2021

GuillaumeGomez mentioned this pull request Jan 11, 2021

Remove is_spotlight field from Trait #80914

Merged

jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jan 11, 2021

camelid reviewed Jan 11, 2021

View reviewed changes

src/librustdoc/formats/cache.rs Outdated Show resolved Hide resolved

src/librustdoc/formats/renderer.rs Outdated Show resolved Hide resolved

src/librustdoc/clean/types.rs Outdated Show resolved Hide resolved

GuillaumeGomez force-pushed the remove-some-function-fields branch from 38100f1 to e4d599e Compare January 11, 2021 21:33

jyn514 reviewed Jan 12, 2021

View reviewed changes

GuillaumeGomez force-pushed the remove-some-function-fields branch 2 times, most recently from c006ffb to b8e5ee6 Compare January 12, 2021 13:09

jyn514 mentioned this pull request Jan 14, 2021

Remove CACHE_KEY global #80987

Merged

camelid added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jan 28, 2021

GuillaumeGomez force-pushed the remove-some-function-fields branch from b8e5ee6 to 4c2c0b1 Compare January 28, 2021 15:24

GuillaumeGomez added 4 commits February 5, 2021 17:23

Improve html::render::cache::get_real_types code

8e0d1ce

Improve code

076fa63

Remove unused cache argument

3c8e13a

Remove unneeded From trait impl for DefKind

c92b161

GuillaumeGomez force-pushed the remove-some-function-fields branch from 01d333d to c92b161 Compare February 5, 2021 16:52

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 Feb 6, 2021

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 Feb 6, 2021

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 Feb 6, 2021

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 6, 2021

bors merged commit a73c2e5 into rust-lang:master Feb 6, 2021

rustbot added this to the 1.52.0 milestone Feb 6, 2021

GuillaumeGomez deleted the remove-some-function-fields branch February 6, 2021 23:47

bors mentioned this pull request Feb 6, 2021

Rename #[doc(spotlight)] to #[doc(notable_trait)] #80965

Merged

camelid added a commit to camelid/rust that referenced this pull request Dec 28, 2021

rustdoc: Remove some unnecessary cache parameters

e19593f

Based on rust-lang#80883 (comment). The `tcx` parameters do seem to be used though, so I only removed the `cache` parameters.

Uh oh!

Conversation

GuillaumeGomez commented Jan 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented Jan 10, 2021

Uh oh!

rust-timer commented Jan 10, 2021

Uh oh!

bors commented Jan 10, 2021

Uh oh!

bors commented Jan 10, 2021

Uh oh!

rust-timer commented Jan 10, 2021

Uh oh!

rust-timer commented Jan 11, 2021

Uh oh!

GuillaumeGomez commented Jan 11, 2021

Uh oh!

jyn514 commented Jan 11, 2021

Uh oh!

camelid left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

camelid commented Jan 11, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented Jan 21, 2021

Uh oh!

GuillaumeGomez commented Jan 28, 2021

Uh oh!

rust-timer commented Jan 28, 2021

Uh oh!

bors commented Jan 28, 2021

Uh oh!

GuillaumeGomez commented Feb 5, 2021

Uh oh!

ollie27 commented Feb 6, 2021

Uh oh!

bors commented Feb 6, 2021

Uh oh!

bors commented Feb 6, 2021

Uh oh!

bors commented Feb 6, 2021

Uh oh!

rust-log-analyzer commented Feb 6, 2021

Uh oh!

GuillaumeGomez commented Feb 6, 2021

Uh oh!

bors commented Feb 6, 2021

Uh oh!

bors commented Feb 6, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

GuillaumeGomez commented Jan 10, 2021 •

edited

Loading