Remove many RefCells from DocContext #82305

camelid · 2021-02-19T22:33:18Z

I left some of them so this change doesn't balloon in size and because
removing the RefCell in DocContext.resolver would require compiler
changes.

Thanks to @jyn514 for making this a lot easier with #82020!

r? @jyn514

camelid · 2021-02-19T22:34:11Z

Waiting for CI to pass and then will do perf run.

camelid · 2021-02-19T22:41:08Z

src/librustdoc/core.rs

    crate resolver: Rc<RefCell<interface::BoxedResolver>>,
    /// Used for normalization.
    ///
    /// Most of this logic is copied from rustc_lint::late.
    crate param_env: Cell<ParamEnv<'tcx>>,
    /// Later on moved into `cache`
-    crate renderinfo: RefCell<RenderInfo>,
+    crate renderinfo: RenderInfo,
    /// Later on moved through `clean::Crate` into `cache`
    crate external_traits: Rc<RefCell<FxHashMap<DefId, clean::Trait>>>,


I left this one in because it seems the lifetimes get tricky because it's moved around.

Yeah, external_traits is a mess: https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/Populating.20cache.20before.20intra-doc.20links

camelid · 2021-02-19T22:41:58Z

src/librustdoc/core.rs

    /// Table synthetic type parameter for `impl Trait` in argument position -> bounds
-    crate impl_trait_bounds: RefCell<FxHashMap<ImplTraitParam, Vec<clean::GenericBound>>>,
+    crate impl_trait_bounds: FxHashMap<ImplTraitParam, Vec<clean::GenericBound>>,
    crate fake_def_ids: RefCell<FxHashMap<CrateNum, DefIndex>>,


I left this one in because

It would require semi-significant changes

Ideally we're going to get rid of fake_def_ids at some point anyway (I think Joshua has an idea for that)

Well, "at some point" is probably pretty far off. But I'm fine with waiting for a follow-up PR.

Note to future readers: I was able to remove this one in #82382.

camelid · 2021-02-19T22:43:36Z

src/librustdoc/visit_lib.rs

@@ -25,7 +25,7 @@ impl<'a, 'tcx> LibEmbargoVisitor<'a, 'tcx> {
    crate fn new(cx: &'a mut crate::core::DocContext<'tcx>) -> LibEmbargoVisitor<'a, 'tcx> {
        LibEmbargoVisitor {


Might I say, LibEmbargoVisitor is one of the most interesting names I've seen in rust-lang/rust.

camelid · 2021-02-19T22:56:00Z

I've been eagerly watching the logs and the rustdoc testsuite just passed!

@bors try @rust-timer queue

rust-timer · 2021-02-19T22:56:02Z

Awaiting bors try build completion.

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

bors · 2021-02-19T22:56:13Z

⌛ Trying commit ab1be029dc3b5d2c2efa94ad7e508172ab5617a0 with merge 42c967a8b9046d57e776497be0724b4e1b1931c7...

bors · 2021-02-19T23:56:46Z

☀️ Try build successful - checks-actions
Build commit: 42c967a8b9046d57e776497be0724b4e1b1931c7 (42c967a8b9046d57e776497be0724b4e1b1931c7)

rust-timer · 2021-02-19T23:56:48Z

Queued 42c967a8b9046d57e776497be0724b4e1b1931c7 with parent 9b471a3, future comparison URL.

rust-timer · 2021-02-20T01:34:50Z

Finished benchmarking try commit (42c967a8b9046d57e776497be0724b4e1b1931c7): 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

camelid · 2021-02-20T01:37:13Z

Fairly small improvements, but they're in the right direction, and it cleans up the code.

src/librustdoc/clean/inline.rs

camelid · 2021-02-20T23:39:33Z

Hmm, seems I have conflicts but bors hasn't reported yet.

camelid · 2021-02-21T00:44:16Z

Rebased.

camelid · 2021-02-21T01:03:14Z

@bors r=@jyn514

bors · 2021-02-21T01:03:15Z

📌 Commit fb9610030cfd4596d3c1fc5074338d38b5b2661d has been approved by jyn514

bors · 2021-02-22T12:44:25Z

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

I left some of them so this change doesn't balloon in size and because removing the RefCell in `DocContext.resolver` would require compiler changes. Thanks to `@jyn514` for making this a lot easier with rust-lang#82020!

camelid · 2021-02-22T18:09:31Z

@bors r=@jyn514

bors · 2021-02-22T18:09:32Z

📌 Commit e4ac499 has been approved by jyn514

bors · 2021-02-22T18:09:33Z

🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened.

jyn514 · 2021-02-22T18:12:49Z

@bors rollup=iffy

This only affects rustdoc's perf, not the compiler's.

Rollup of 10 pull requests Successful merges: - rust-lang#81629 (Point out implicit deref coercions in borrow) - rust-lang#82113 (Improve non_fmt_panic lint.) - rust-lang#82258 (Implement -Z hir-stats for nested foreign items) - rust-lang#82296 (Support `pub` on `macro_rules`) - rust-lang#82297 (Consider auto derefs before warning about write only fields) - rust-lang#82305 (Remove many RefCells from DocContext) - rust-lang#82308 (Lower condition of `if` expression before it's "then" block) - rust-lang#82311 (Jsondocck improvements) - rust-lang#82362 (Fix mir-cfg dumps) - rust-lang#82391 (disable atomic_max/min tests in Miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

camelid added C-cleanup Category: PRs that clean code up or issues documenting cleanup. I-compiletime Issue: Problems and improvements with respect to compile times. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Feb 19, 2021

rust-highfive assigned jyn514 Feb 19, 2021

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

camelid commented Feb 19, 2021

View reviewed changes

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

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

jyn514 approved these changes Feb 20, 2021

View reviewed changes

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

camelid force-pushed the no-more-refcell branch 2 times, most recently from af3e95d to fb96100 Compare February 21, 2021 00:44

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 21, 2021

camelid mentioned this pull request Feb 21, 2021

rustdoc: Remove unnecessary Cell around param_env #82353

Merged

jyn514 mentioned this pull request Feb 22, 2021

rustdoc: Remove fake_def_ids RefCell #82382

Merged

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 22, 2021

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

Remove many RefCells from DocContext

e4ac499

I left some of them so this change doesn't balloon in size and because removing the RefCell in `DocContext.resolver` would require compiler changes. Thanks to `@jyn514` for making this a lot easier with rust-lang#82020!

camelid force-pushed the no-more-refcell branch from fb96100 to e4ac499 Compare February 22, 2021 18:08

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 22, 2021

Dylan-DPC-zz mentioned this pull request Feb 23, 2021

Rollup of 10 pull requests #82443

Merged

bors merged commit 8e67fe5 into rust-lang:master Feb 23, 2021

rustbot added this to the 1.52.0 milestone Feb 23, 2021

camelid deleted the no-more-refcell branch February 24, 2021 04:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove many RefCells from DocContext #82305

Remove many RefCells from DocContext #82305

camelid commented Feb 19, 2021

camelid commented Feb 19, 2021

camelid Feb 19, 2021

jyn514 Feb 20, 2021

camelid Feb 19, 2021

jyn514 Feb 20, 2021

camelid Feb 22, 2021

camelid Feb 19, 2021

camelid commented Feb 19, 2021

rust-timer commented Feb 19, 2021

bors commented Feb 19, 2021

bors commented Feb 19, 2021

rust-timer commented Feb 19, 2021

rust-timer commented Feb 20, 2021

camelid commented Feb 20, 2021

camelid commented Feb 20, 2021

camelid commented Feb 21, 2021

camelid commented Feb 21, 2021

bors commented Feb 21, 2021

bors commented Feb 22, 2021

camelid commented Feb 22, 2021

bors commented Feb 22, 2021

bors commented Feb 22, 2021

jyn514 commented Feb 22, 2021

		@@ -25,7 +25,7 @@ impl<'a, 'tcx> LibEmbargoVisitor<'a, 'tcx> {
		crate fn new(cx: &'a mut crate::core::DocContext<'tcx>) -> LibEmbargoVisitor<'a, 'tcx> {
		LibEmbargoVisitor {

Remove many RefCells from DocContext #82305

Remove many RefCells from DocContext #82305

Conversation

camelid commented Feb 19, 2021

camelid commented Feb 19, 2021

camelid Feb 19, 2021

Choose a reason for hiding this comment

jyn514 Feb 20, 2021

Choose a reason for hiding this comment

camelid Feb 19, 2021

Choose a reason for hiding this comment

jyn514 Feb 20, 2021

Choose a reason for hiding this comment

camelid Feb 22, 2021

Choose a reason for hiding this comment

camelid Feb 19, 2021

Choose a reason for hiding this comment

camelid commented Feb 19, 2021

rust-timer commented Feb 19, 2021

bors commented Feb 19, 2021

bors commented Feb 19, 2021

rust-timer commented Feb 19, 2021

rust-timer commented Feb 20, 2021

camelid commented Feb 20, 2021

camelid commented Feb 20, 2021

camelid commented Feb 21, 2021

camelid commented Feb 21, 2021

bors commented Feb 21, 2021

bors commented Feb 22, 2021

camelid commented Feb 22, 2021

bors commented Feb 22, 2021

bors commented Feb 22, 2021

jyn514 commented Feb 22, 2021