Pass a `TyCtxt` through to `FormatRender` by jyn514 · Pull Request #80090 · rust-lang/rust

jyn514 · 2020-12-16T19:58:39Z

This is the next step after #79957 for #76382. Eventually I plan to use this to remove stability, const_stability, and deprecation from Item, but that needs more extensive changes (in particular, #75355 or something like it).

This has no actual changes to behavior, it's just moving types around.

ccc #80014 (comment)

rust-highfive · 2020-12-16T19:58:42Z

r? @GuillaumeGomez

(rust-highfive has picked a reviewer for you, use r? to override)

bors · 2020-12-17T15:26:41Z

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

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

jyn514 · 2020-12-17T16:32:22Z

Since both this and #80119 add as_sym(), I'll wait to rebase it until 80119 is merged.

jyn514 · 2020-12-17T16:34:13Z

Err maybe not? I'm starting to lose track of which changes happened in which PRs 😆 too many open at the same time.

First actually useful step in rust-lang#76382 This doesn't yet compile because there's no way to get a `Lrc<Session>` from a TyCtxt, only a `&Session`.

Apparently expansion() really does return Rc, not Lrc

GuillaumeGomez · 2020-12-17T22:31:25Z

Quite a lot of information was stored in the first pass to not have the TyCtxt for historical reasons which forced some not-so-nice implementations afterwards. Thanks to this, we'll be able to have much more on-demand requests instead of just storing everything. I'm expecting big memory and perf improvements thanks to this, so thank you @jyn514 !

r=me if this is ready for you (you seemed to be doing some tests still? 😄 )

jyn514 · 2020-12-18T03:17:08Z

This is ready to go, I was just fixing a rebase conflict.

@bors r=GuillaumeGomez

bors · 2020-12-18T03:17:10Z

📌 Commit 0c2f76a has been approved by GuillaumeGomez

jyn514 · 2020-12-18T03:17:39Z

Thanks to this, we'll be able to have much more on-demand requests instead of just storing everything. I'm expecting big memory and perf improvements thanks to this, so thank you @jyn514 !

I already started on a few :) #80095 #80099

bors · 2020-12-18T08:44:56Z

⌛ Testing commit 0c2f76a with merge d8d3ab9...

bors · 2020-12-18T11:39:03Z

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing d8d3ab9 to master...

rust-highfive · 2020-12-18T11:40:09Z

📣 Toolstate changed by #80090!

Tested on commit d8d3ab9.
Direct link to PR: #80090

🎉 rls on linux: test-fail → test-pass (cc @Xanewok).

@Xanewok

Tested on commit rust-lang/rust@d8d3ab9. Direct link to PR: <rust-lang/rust#80090> 🎉 rls on linux: test-fail → test-pass (cc @Xanewok).

…meGomez [rustdoc] Calculate stability, const_stability, and deprecation on-demand Previously, they would always be calculated ahead of time, which bloated the size of `clean::Item`. Builds on rust-lang#80090 and should not be merged before. Helps with rust-lang#79103 and rust-lang#76382. cc rust-lang#80014 (comment) This brings `Item` down to 568 bytes, down from 616.

…umeGomez Remove `DefPath` from `Visibility` and calculate it on demand Depends on rust-lang#80090 and should not be merged before. Helps with rust-lang#79103 and rust-lang#76382. cc rust-lang#80014 (comment) - `@nnethercote` I figured it out! It was simpler than I expected :) This brings the size of `clean::Visibility` down from 40 bytes to 8. Note that this does *not* remove `clean::Visibility`, even though it's now basically the same as `ty::Visibility`, because the `Invsible` variant means something different from `Inherited` and I thought it would be be confusing to merge the two. See the new comments on `impl Clean for ty::Visibility` for details.

jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Dec 16, 2020

rust-highfive assigned GuillaumeGomez Dec 16, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 16, 2020

This comment has been minimized.
Sign in to view

jyn514 force-pushed the tcx-in-render branch from 5b78318 to b0838d8Compare December 16, 2020 20:14

This comment has been minimized.
Sign in to view

This was referenced Dec 16, 2020
[rustdoc] Calculate stability, const_stability, and deprecation on-demand #80095
Merged
Remove DefPath from Visibility and calculate it on demand #80099
Merged

jyn514 mentioned this pull request Dec 17, 2020
Continue String to Symbol conversion in rustdoc (1) #80119
Merged

jyn514 added 8 commits December 17, 2020 11:34

Split apart create_config and run_core
0ac58f7

Separate create_resolver into a new function
34e8b0a

Move run_renderer into the main global_ctxt closure
79ab333

[tmp] Pass TyCtxt through to the render backend
9221d4d
First actually useful step in rust-lang#76382 This doesn't yet compile because there's no way to get a `Lrc<Session>` from a TyCtxt, only a `&Session`.

Make it compile
47c9694

Fix error with --cfg parallel_compiler
789c902
Apparently expansion() really does return Rc, not Lrc

TODO -> FIXME
b421f2e

Fix rebase conflict
0c2f76a

jyn514 force-pushed the tcx-in-render branch from 4654790 to 0c2f76aCompare December 17, 2020 16:40

GuillaumeGomez approved these changes Dec 17, 2020
View reviewed changes

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 Dec 18, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 18, 2020

bors merged commit d8d3ab9 into rust-lang:masterDec 18, 2020

rustbot added this to the 1.50.0 milestone Dec 18, 2020

bors mentioned this pull request Dec 18, 2020
Rename "--display-warnings" to "--display-doctest-warnings" #73314
Merged

jyn514 deleted the tcx-in-render branch December 18, 2020 13:44

jyn514 mentioned this pull request Dec 23, 2020
regression: Rustdoc shows pub(self) as pub(in a::b)#79139
Closed

Navigation Menu

Uh oh!

Uh oh!

Pass a `TyCtxt` through to `FormatRender` - #80090

Pass a `TyCtxt` through to `FormatRender`#80090
bors merged 8 commits into
rust-lang:masterfrom
jyn514:tcx-in-render

jyn514 commented Dec 16, 2020

Uh oh!

rust-highfive commented Dec 16, 2020

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Dec 17, 2020

Uh oh!

jyn514 commented Dec 17, 2020

Uh oh!

jyn514 commented Dec 17, 2020

Uh oh!

GuillaumeGomez commented Dec 17, 2020

Uh oh!

jyn514 commented Dec 18, 2020

Uh oh!

bors commented Dec 18, 2020

Uh oh!

jyn514 commented Dec 18, 2020

Uh oh!

bors commented Dec 18, 2020

Uh oh!

bors commented Dec 18, 2020

Uh oh!

rust-highfive commented Dec 18, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Uh oh!

Conversation

jyn514 commented Dec 16, 2020

Uh oh!

rust-highfive commented Dec 16, 2020

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Dec 17, 2020

Uh oh!

jyn514 commented Dec 17, 2020

Uh oh!

jyn514 commented Dec 17, 2020

Uh oh!

GuillaumeGomez commented Dec 17, 2020

Uh oh!

jyn514 commented Dec 18, 2020

Uh oh!

bors commented Dec 18, 2020

Uh oh!

jyn514 commented Dec 18, 2020

Uh oh!

bors commented Dec 18, 2020

Uh oh!

bors commented Dec 18, 2020

Uh oh!

rust-highfive commented Dec 18, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants