diff options
| author | Joshua Nelson <jnelson@cloudflare.com> | 2021-12-18 10:44:58 -0600 |
|---|---|---|
| committer | Joshua Nelson <jnelson@cloudflare.com> | 2021-12-18 10:47:54 -0600 |
| commit | dea1c6861409b06d2e3f4ebfb46af908a1b3ae29 (patch) | |
| tree | 4a08a526c981f279ebd79420b35020f38b1950d3 /src/librustdoc/html | |
| parent | d3f300477b89e70dd42379ba53c0e8ff74e9c694 (diff) | |
| download | rust-dea1c6861409b06d2e3f4ebfb46af908a1b3ae29.tar.gz rust-dea1c6861409b06d2e3f4ebfb46af908a1b3ae29.zip | |
Remove `collapsed` field
`render/context` always runs after `run_global_context`, so it was always set to `true`. This is a holdover from when rustdoc allowed configuring passes, but the `collapse-docs` pass was removed ages ago, and the ability to configure passes is about to be removed.
Diffstat (limited to 'src/librustdoc/html')
| -rw-r--r-- | src/librustdoc/html/render/context.rs | 9 | ||||
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/librustdoc/html/render/context.rs b/src/librustdoc/html/render/context.rs index 365d959ad9f..6f190dbf66b 100644 --- a/src/librustdoc/html/render/context.rs +++ b/src/librustdoc/html/render/context.rs @@ -88,8 +88,6 @@ crate struct SharedContext<'tcx> { crate local_sources: FxHashMap<PathBuf, String>, /// Show the memory layout of types in the docs. pub(super) show_type_layout: bool, - /// Whether the collapsed pass ran - collapsed: bool, /// The base-URL of the issue tracker for when an item has been tagged with /// an issue number. pub(super) issue_tracker_base_url: Option<String>, @@ -142,12 +140,6 @@ impl SharedContext<'_> { Ok(()) } - /// Returns the `collapsed_doc_value` of the given item if this is the main crate, otherwise - /// returns the `doc_value`. - crate fn maybe_collapsed_doc_value<'a>(&self, item: &'a clean::Item) -> Option<String> { - if self.collapsed { item.collapsed_doc_value() } else { item.doc_value() } - } - crate fn edition(&self) -> Edition { self.tcx.sess.edition() } @@ -472,7 +464,6 @@ impl<'tcx> FormatRenderer<'tcx> for Context<'tcx> { let (sender, receiver) = channel(); let mut scx = SharedContext { tcx, - collapsed: krate.collapsed, src_root, local_sources, issue_tracker_base_url, diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 2432f5cc085..f921e910294 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -567,7 +567,7 @@ fn document_full_inner( is_collapsible: bool, heading_offset: HeadingOffset, ) { - if let Some(s) = cx.shared.maybe_collapsed_doc_value(item) { + if let Some(s) = item.collapsed_doc_value() { debug!("Doc block: =====\n{}\n=====", s); if is_collapsible { w.write_str( @@ -1612,7 +1612,7 @@ fn render_impl( write!(w, "</summary>") } - if let Some(ref dox) = cx.shared.maybe_collapsed_doc_value(&i.impl_item) { + if let Some(ref dox) = i.impl_item.collapsed_doc_value() { let mut ids = cx.id_map.borrow_mut(); write!( w, |
