From 5b7409797555b8fcfb50dc92fcda9bd1298d70c4 Mon Sep 17 00:00:00 2001 From: Camelid Date: Mon, 1 Mar 2021 20:06:49 -0800 Subject: [PATCH] Undo addition of boxes I don't think the boxing helped performance, in fact I think it potentially made it worse. The data was still being copied, but now it was through a pointer. Thinking about it more, I think boxing might only help when you're passing a big object around by value all the time, rather than the slowdown being that you're cloning it. --- src/librustdoc/html/markdown/tests.rs | 1 - src/librustdoc/html/render/context.rs | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/librustdoc/html/markdown/tests.rs b/src/librustdoc/html/markdown/tests.rs index e016d2c3ab00..e2ce9ad23f47 100644 --- a/src/librustdoc/html/markdown/tests.rs +++ b/src/librustdoc/html/markdown/tests.rs @@ -1,7 +1,6 @@ use super::{plain_text_summary, short_markdown_summary}; use super::{ErrorCodes, IdMap, Ignore, LangString, Markdown, MarkdownHtml}; use rustc_span::edition::{Edition, DEFAULT_EDITION}; -use std::cell::RefCell; #[test] fn test_unique_id() { diff --git a/src/librustdoc/html/render/context.rs b/src/librustdoc/html/render/context.rs index 41d4aef7c7af..864fbccbcc45 100644 --- a/src/librustdoc/html/render/context.rs +++ b/src/librustdoc/html/render/context.rs @@ -52,10 +52,10 @@ crate struct Context<'tcx> { /// publicly reused items to redirect to the right location. pub(super) render_redirect_pages: bool, /// The map used to ensure all generated 'id=' attributes are unique. - pub(super) id_map: Box>, + pub(super) id_map: RefCell, /// Tracks section IDs for `Deref` targets so they match in both the main /// body and the sidebar. - pub(super) deref_id_map: Box>>, + pub(super) deref_id_map: RefCell>, /// Shared mutable state. /// /// Issue for improving the situation: [#82381][] @@ -76,7 +76,7 @@ crate struct Context<'tcx> { // `Context` is cloned a lot, so we don't want the size to grow unexpectedly. #[cfg(target_arch = "x86_64")] -rustc_data_structures::static_assert_size!(Context<'_>, 88); +rustc_data_structures::static_assert_size!(Context<'_>, 152); impl<'tcx> Context<'tcx> { pub(super) fn path(&self, filename: &str) -> PathBuf { @@ -415,8 +415,8 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> { current: Vec::new(), dst, render_redirect_pages: false, - id_map: Box::new(RefCell::new(id_map)), - deref_id_map: Box::new(RefCell::new(FxHashMap::default())), + id_map: RefCell::new(id_map), + deref_id_map: RefCell::new(FxHashMap::default()), shared: Rc::new(scx), cache: Rc::new(cache), }; @@ -438,8 +438,8 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> { current: self.current.clone(), dst: self.dst.clone(), render_redirect_pages: self.render_redirect_pages, - id_map: Box::new(RefCell::new(id_map)), - deref_id_map: Box::new(RefCell::new(FxHashMap::default())), + id_map: RefCell::new(id_map), + deref_id_map: RefCell::new(FxHashMap::default()), shared: Rc::clone(&self.shared), cache: Rc::clone(&self.cache), }