Skip to content

Remove some function fields - #80883

Merged
bors merged 6 commits into
rust-lang:masterfrom
GuillaumeGomez:remove-some-function-fields
Feb 6, 2021
Merged

Remove some function fields#80883
bors merged 6 commits into
rust-lang:masterfrom
GuillaumeGomez:remove-some-function-fields

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Jan 10, 2021•
edited
Loading

Copy link
Copy Markdown
Member

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

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

GuillaumeGomez commented Jan 10, 2021

Copy link
Copy Markdown
MemberAuthor

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

@bors try @rust-timer queue

@rust-timer

rust-timer commented Jan 10, 2021

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@bors

bors commented Jan 10, 2021

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Jan 10, 2021

Copy link
Copy Markdown
Collaborator

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

@rust-timer

rust-timer commented Jan 10, 2021

Copy link
Copy Markdown
Collaborator

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

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

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

rust-timer commented Jan 11, 2021

Copy link
Copy Markdown
Collaborator

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

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

GuillaumeGomez commented Jan 11, 2021

Copy link
Copy Markdown
MemberAuthor

Interesting:

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

Much better than what I expected.

@GuillaumeGomezGuillaumeGomez mentioned this pull request Jan 11, 2021
Merged
@jyn514

jyn514 commented Jan 11, 2021

Copy link
Copy Markdown
Member

@camelid would you like to review the change?

@jyn514jyn514 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
camelid reviewed Jan 11, 2021
View reviewed changes

@camelidcamelid 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.

Here's a few comments.

Comment threadsrc/librustdoc/formats/cache.rs Outdated
Comment threadsrc/librustdoc/formats/renderer.rs Outdated
Comment threadsrc/librustdoc/clean/types.rs Outdated
@camelid

camelid commented Jan 11, 2021

Copy link
Copy Markdown
Member

@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.

@GuillaumeGomez
GuillaumeGomezforce-pushed the remove-some-function-fields branch from 38100f1 to e4d599eCompareJanuary 11, 2021 21:33
jyn514
jyn514 reviewed Jan 12, 2021
View reviewed changes
Comment threadsrc/librustdoc/clean/mod.rs Outdated
Comment threadsrc/librustdoc/clean/types.rs Outdated
Comment threadsrc/librustdoc/clean/types.rs Outdated
Comment threadsrc/librustdoc/clean/types.rs Outdated
Comment threadsrc/librustdoc/formats/cache.rs Outdated
Comment threadsrc/librustdoc/formats/cache.rs Outdated
Comment threadsrc/librustdoc/html/render/cache.rs Outdated
Comment threadsrc/librustdoc/formats/cache.rs Outdated
@GuillaumeGomez
GuillaumeGomezforce-pushed the remove-some-function-fields branch 2 times, most recently from c006ffb to b8e5ee6CompareJanuary 12, 2021 13:09
@jyn514jyn514 mentioned this pull request Jan 14, 2021
Merged
@bors

bors commented Jan 21, 2021

Copy link
Copy Markdown
Collaborator

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

@camelidcamelid 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
GuillaumeGomezforce-pushed the remove-some-function-fields branch from b8e5ee6 to 4c2c0b1CompareJanuary 28, 2021 15:24
@GuillaumeGomez

GuillaumeGomez commented Jan 28, 2021

Copy link
Copy Markdown
MemberAuthor

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

rust-timer commented Jan 28, 2021

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@bors

bors commented Jan 28, 2021

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 4c2c0b152785a5826fd45430d7f6e3f087271cd9 with merge bdc8ba6d71c33ac2e37bb4e7da6544dde3d300d3...

@GuillaumeGomez
GuillaumeGomezforce-pushed the remove-some-function-fields branch from 01d333d to c92b161CompareFebruary 5, 2021 16:52
@GuillaumeGomez

GuillaumeGomez commented Feb 5, 2021

Copy link
Copy Markdown
MemberAuthor

Rebased.

@ollie27

ollie27 commented Feb 6, 2021

Copy link
Copy Markdown
Contributor

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

bors commented Feb 6, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit c92b161 has been approved by ollie27

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

bors commented Feb 6, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c92b161 with merge 6dd633a726a1900af8a4c6a769809093b6cf3aa1...

@bors

bors commented Feb 6, 2021

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@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 Feb 6, 2021
@rust-log-analyzer

rust-log-analyzer commented Feb 6, 2021

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)

@GuillaumeGomez

GuillaumeGomez commented Feb 6, 2021

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

bors commented Feb 6, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c92b161 with merge a73c2e5...

@bors

bors commented Feb 6, 2021

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 6, 2021
@bors
bors merged commit a73c2e5 into rust-lang:masterFeb 6, 2021
@rustbotrustbot added this to the 1.52.0 milestone Feb 6, 2021
@GuillaumeGomez
GuillaumeGomez deleted the remove-some-function-fields branch February 6, 2021 23:47
@borsbors mentioned this pull request Feb 6, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 24, 2021
@bors
Auto merge ofrust-lang#80914- GuillaumeGomez:remove-is_spotlight, r…
a8486b6
…=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`
camelid added a commit to camelid/rust that referenced this pull request Dec 28, 2021
@camelid
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.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@calebcartwrightcalebcartwrightcalebcartwright left review comments
@camelidcamelidcamelid left review comments
+3 more reviewers
@bugadanibugadanibugadani left review comments
@ollie27ollie27ollie27 left review comments
@jyn514jyn514jyn514 left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@ollie27ollie27

@camelidcamelid

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.merged-by-borsThis PR was explicitly merged by bors.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.52.0

Development

Successfully merging this pull request may close these issues.

11 participants

@GuillaumeGomez@rust-timer@bors@jyn514@camelid@bugadani@ollie27@rust-log-analyzer@calebcartwright@rust-highfive@rustbot