summary refs log tree commit diff
path: root/src/librustdoc/html/render/mod.rs
diff options
context:
space:
mode:
authorJacob Hoffman-Andrews <github@hoffman-andrews.com>2021-06-08 10:39:57 -0700
committerJacob Hoffman-Andrews <github@hoffman-andrews.com>2021-06-16 22:08:44 -0700
commitbff4f073c8bc09788c5111ef6f7aa2b74e75dc89 (patch)
tree320d6fc44ba53a7e2490801f11f68407d2fb6fa3 /src/librustdoc/html/render/mod.rs
parentce6472987d2cb466345a857cb2efdd06307c5ebf (diff)
downloadrust-bff4f073c8bc09788c5111ef6f7aa2b74e75dc89.tar.gz
rust-bff4f073c8bc09788c5111ef6f7aa2b74e75dc89.zip
Use render_impl_summary when rendering traits.
Diffstat (limited to 'src/librustdoc/html/render/mod.rs')
-rw-r--r--src/librustdoc/html/render/mod.rs41
1 files changed, 17 insertions, 24 deletions
diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs
index 4f3acfb8e82..4ce14e6eb3c 100644
--- a/src/librustdoc/html/render/mod.rs
+++ b/src/librustdoc/html/render/mod.rs
@@ -1542,15 +1542,10 @@ fn render_impl(
         }
     }
     if render_mode == RenderMode::Normal {
-        let on_trait_page = matches!(*parent.kind, clean::ItemKind::TraitItem(_));
-        let has_impl_items = !(impl_items.is_empty() && default_impl_items.is_empty());
-        let toggled = !on_trait_page && has_impl_items;
-        let is_implementing_trait = i.inner_impl().trait_.is_some();
+        let toggled = !(impl_items.is_empty() && default_impl_items.is_empty());
         if toggled {
             close_tags.insert_str(0, "</details>");
             write!(w, "<details class=\"rustdoc-toggle implementors-toggle\" open>");
-        }
-        if toggled {
             write!(w, "<summary>")
         }
         render_impl_summary(
@@ -1573,23 +1568,21 @@ fn render_impl(
             }
         }
 
-        if !on_trait_page {
-            if let Some(ref dox) = cx.shared.maybe_collapsed_doc_value(&i.impl_item) {
-                let mut ids = cx.id_map.borrow_mut();
-                write!(
-                    w,
-                    "<div class=\"docblock\">{}</div>",
-                    Markdown(
-                        &*dox,
-                        &i.impl_item.links(cx),
-                        &mut ids,
-                        cx.shared.codes,
-                        cx.shared.edition(),
-                        &cx.shared.playground
-                    )
-                    .into_string()
-                );
-            }
+        if let Some(ref dox) = cx.shared.maybe_collapsed_doc_value(&i.impl_item) {
+            let mut ids = cx.id_map.borrow_mut();
+            write!(
+                w,
+                "<div class=\"docblock\">{}</div>",
+                Markdown(
+                    &*dox,
+                    &i.impl_item.links(cx),
+                    &mut ids,
+                    cx.shared.codes,
+                    cx.shared.edition(),
+                    &cx.shared.playground
+                )
+                .into_string()
+            );
         }
     }
     if !default_impl_items.is_empty() || !impl_items.is_empty() {
@@ -1601,7 +1594,7 @@ fn render_impl(
     w.write_str(&close_tags);
 }
 
-fn render_impl_summary(
+pub(crate) fn render_impl_summary(
     w: &mut Buffer,
     cx: &Context<'_>,
     i: &Impl,