about summary refs log tree commit diff
path: root/src/librustdoc/html/render.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-12-03 00:54:52 +0000
committerbors <bors@rust-lang.org>2017-12-03 00:54:52 +0000
commit16ba4591d7294e16d5fd5ea1fe8dd604f77ddd4e (patch)
tree3d4cf02c93dd5e5f5d80c07874b7534cb26dcfd0 /src/librustdoc/html/render.rs
parent088f328ec5839d535891de5a5af55a6ba3479198 (diff)
parentb4448435f95ab62cc2017996f60cdb27ea212d32 (diff)
downloadrust-16ba4591d7294e16d5fd5ea1fe8dd604f77ddd4e.tar.gz
rust-16ba4591d7294e16d5fd5ea1fe8dd604f77ddd4e.zip
Auto merge of #46384 - ollie27:rustdoc_inline_assoc, r=QuietMisdreavus
rustdoc: Fix issues with cross-crate inlined associated items

* Visibility was missing from impl items.
* Attributes and docs were missing from consts and types in impls.
* Const default values were missing from traits.

This unifies the code that handles associated items from impls and traits.
Diffstat (limited to 'src/librustdoc/html/render.rs')
-rw-r--r--src/librustdoc/html/render.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index 44399044166..9dc01bb0916 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -2621,7 +2621,8 @@ fn assoc_const(w: &mut fmt::Formatter,
                ty: &clean::Type,
                _default: Option<&String>,
                link: AssocItemLink) -> fmt::Result {
-    write!(w, "const <a href='{}' class=\"constant\"><b>{}</b></a>: {}",
+    write!(w, "{}const <a href='{}' class=\"constant\"><b>{}</b></a>: {}",
+           VisSpace(&it.visibility),
            naive_assoc_href(it, link),
            it.name.as_ref().unwrap(),
            ty)?;