about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2020-12-26 14:22:08 +0100
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2021-01-02 19:16:27 +0100
commitd0e7523a3246a36d6647f60e5bd75d9e3c71280e (patch)
tree7833c62c964da5b8f0bd4d0cadbf2a521297cc47
parent4ba1928fa2aa73abeb541dad7d72bda94509d113 (diff)
downloadrust-d0e7523a3246a36d6647f60e5bd75d9e3c71280e.tar.gz
rust-d0e7523a3246a36d6647f60e5bd75d9e3c71280e.zip
Remove unused collapse pass
-rw-r--r--src/librustdoc/core.rs3
-rw-r--r--src/librustdoc/passes/collapse_docs.rs14
-rw-r--r--src/librustdoc/passes/mod.rs5
3 files changed, 3 insertions, 19 deletions
diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
index 053eaac0169..4aeca0faea7 100644
--- a/src/librustdoc/core.rs
+++ b/src/librustdoc/core.rs
@@ -623,6 +623,9 @@ crate fn run_global_ctxt(
 
     ctxt.sess().abort_if_errors();
 
+    // The main crate doc comments are always collapsed.
+    krate.collapsed = true;
+
     (krate, ctxt.renderinfo.into_inner(), ctxt.render_options)
 }
 
diff --git a/src/librustdoc/passes/collapse_docs.rs b/src/librustdoc/passes/collapse_docs.rs
deleted file mode 100644
index 4994765dfe5..00000000000
--- a/src/librustdoc/passes/collapse_docs.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-use crate::clean;
-use crate::core::DocContext;
-use crate::passes::Pass;
-
-crate const COLLAPSE_DOCS: Pass = Pass {
-    name: "collapse-docs",
-    run: collapse_docs,
-    description: "concatenates all document attributes into one document attribute",
-};
-
-crate fn collapse_docs(mut krate: clean::Crate, _: &DocContext<'_>) -> clean::Crate {
-    krate.collapsed = true;
-    krate
-}
diff --git a/src/librustdoc/passes/mod.rs b/src/librustdoc/passes/mod.rs
index 51818d7faf0..7ac42c75992 100644
--- a/src/librustdoc/passes/mod.rs
+++ b/src/librustdoc/passes/mod.rs
@@ -14,9 +14,6 @@ crate use stripper::*;
 mod non_autolinks;
 crate use self::non_autolinks::CHECK_NON_AUTOLINKS;
 
-mod collapse_docs;
-crate use self::collapse_docs::COLLAPSE_DOCS;
-
 mod strip_hidden;
 crate use self::strip_hidden::STRIP_HIDDEN;
 
@@ -84,7 +81,6 @@ crate const PASSES: &[Pass] = &[
     CHECK_PRIVATE_ITEMS_DOC_TESTS,
     STRIP_HIDDEN,
     UNINDENT_COMMENTS,
-    COLLAPSE_DOCS,
     STRIP_PRIVATE,
     STRIP_PRIV_IMPORTS,
     PROPAGATE_DOC_CFG,
@@ -99,7 +95,6 @@ crate const PASSES: &[Pass] = &[
 /// The list of passes run by default.
 crate const DEFAULT_PASSES: &[ConditionalPass] = &[
     ConditionalPass::always(COLLECT_TRAIT_IMPLS),
-    ConditionalPass::always(COLLAPSE_DOCS),
     ConditionalPass::always(UNINDENT_COMMENTS),
     ConditionalPass::always(CHECK_PRIVATE_ITEMS_DOC_TESTS),
     ConditionalPass::new(STRIP_HIDDEN, WhenNotDocumentHidden),