about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-27 09:46:15 +0000
committerbors <bors@rust-lang.org>2014-07-27 09:46:15 +0000
commite0d10bb69ab04ab041b39c71f7537d8c63ef9669 (patch)
tree99e12c9a253b0a29f8b3b0ac5f6926f61ac7bae7 /src
parentad4fa46f5b17ea4eb64192b3aab71953bd91240d (diff)
parentc05cfab7f979f72a25821060576a2aaea4c61ef9 (diff)
downloadrust-e0d10bb69ab04ab041b39c71f7537d8c63ef9669.tar.gz
rust-e0d10bb69ab04ab041b39c71f7537d8c63ef9669.zip
auto merge of #16016 : tomjakubowski/rust/rustdoc-fix-15490, r=alexcrichton
Previously, private and `#[doc(hidden)]` struct fields appeared in the
search index despite being hidden from the struct's documentation.

Fix #15490
Diffstat (limited to 'src')
-rw-r--r--src/librustdoc/html/render.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs
index eed058878e0..95637d311d8 100644
--- a/src/librustdoc/html/render.rs
+++ b/src/librustdoc/html/render.rs
@@ -845,8 +845,12 @@ impl DocFolder for Cache {
                     }
                     _ => (None, Some(self.stack.as_slice()))
                 };
+                let hidden_field = match item.inner {
+                    clean::StructFieldItem(clean::HiddenStructField) => true,
+                    _ => false
+                };
                 match parent {
-                    (parent, Some(path)) if !self.privmod => {
+                    (parent, Some(path)) if !self.privmod && !hidden_field => {
                         self.search_index.push(IndexItem {
                             ty: shortty(&item),
                             name: s.to_string(),