about summary refs log tree commit diff
path: root/src/librustdoc/passes
diff options
context:
space:
mode:
authorOliver Middleton <olliemail27@gmail.com>2017-06-11 13:28:45 +0100
committerOliver Middleton <olliemail27@gmail.com>2017-06-11 18:26:01 +0100
commit7298dabdb3262c047748c4b26ce64c6c8769a7d9 (patch)
tree4167eed3882790dc64e1460d0f8f1eec3b0f02b7 /src/librustdoc/passes
parent19193d6390644b5d621934bac6a33caacfb9ad31 (diff)
downloadrust-7298dabdb3262c047748c4b26ce64c6c8769a7d9.tar.gz
rust-7298dabdb3262c047748c4b26ce64c6c8769a7d9.zip
rustdoc: Stop stripping empty modules
There is no good reason to strip empty modules with no documentation and
doing so causes subtle problems.
Diffstat (limited to 'src/librustdoc/passes')
-rw-r--r--src/librustdoc/passes/mod.rs18
1 files changed, 5 insertions, 13 deletions
diff --git a/src/librustdoc/passes/mod.rs b/src/librustdoc/passes/mod.rs
index 1cc4f9371cb..8f6faabd157 100644
--- a/src/librustdoc/passes/mod.rs
+++ b/src/librustdoc/passes/mod.rs
@@ -145,20 +145,12 @@ impl<'a> fold::DocFolder for Stripper<'a> {
             self.fold_item_recur(i)
         };
 
-        i.and_then(|i| {
-            match i.inner {
-                // emptied modules have no need to exist
-                clean::ModuleItem(ref m)
-                    if m.items.is_empty() &&
-                       i.doc_value().is_none() => None,
-                _ => {
-                    if self.update_retained {
-                        self.retained.insert(i.def_id);
-                    }
-                    Some(i)
-                }
+        if let Some(ref i) = i {
+            if self.update_retained {
+                self.retained.insert(i.def_id);
             }
-        })
+        }
+        i
     }
 }