Fix re-exports and extern-crate

Author: P1n3appl3

src/librustdoc/json/mod.rs

@@ -151,23 +151,29 @@ impl FormatRenderer for JsonRenderer {
     }
 
     fn item(&mut self, item: clean::Item, cache: &Cache) -> Result<(), Error> {
-        use clean::ItemEnum::*;
         // Flatten items that recursively store other items by inserting them into the index
-        if let ModuleItem(_) = &item.inner {
-            // but ignore modules because we handle recursing into them separately
-        } else {
-            item.inner.inner_items().for_each(|i| self.item(i.clone(), cache).unwrap())
-        }
+        item.inner.inner_items().for_each(|i| self.item(i.clone(), cache).unwrap());
         self.insert(item.clone(), cache);
         Ok(())
     }
 
     fn mod_item_in(
         &mut self,
         item: &clean::Item,
-        _item_name: &str,
+        _module_name: &str,
         cache: &Cache,
     ) -> Result<(), Error> {
+        use clean::types::ItemEnum::*;
+        if let ModuleItem(m) = &item.inner {
+            for item in &m.items {
+                match item.inner {
+                    // These don't have names so they don't get added to the output by default
+                    ImportItem(_) => self.insert(item.clone(), cache),
+                    ExternCrateItem(_, _) => self.insert(item.clone(), cache),
+                    _ => {}
+                }
+            }
+        }
         self.insert(item.clone(), cache);
         Ok(())
     }

src/librustdoc/json/types.rs

@@ -101,7 +101,7 @@ pub enum Visibility {
     /// public traits and variants of public enums.
     Default,
     Crate,
-    // TODO: Restricted(Id, String),
+    // FIXME(pineapple): add support for restricted paths
 }
 
 #[serde(rename_all = "snake_case")]
@@ -440,7 +440,7 @@ pub struct Import {
     /// `use source as name;`
     pub name: String,
     /// The ID of the item being imported.
-    pub id: Option<Id>, // TODO: when is this None?
+    pub id: Option<Id>, // TODO when is this None?
     /// Whether this import uses a glob: `use source::*;`
     pub glob: bool,
 }

src/test/run-make-fulldeps/rustdoc-json/check_missing_items.py

@@ -115,7 +115,9 @@ def check_type(ty):
     visited.add(current)
     item = get_local_item(current)
     # check intradoc links
-    work_list |= set(item["links"].values()) - visited
+    for (_name, link) in item["links"].items():
+        if not valid_id(link):
+            print("Intra-doc link contains invalid ID:", link)
 
     # check all fields that reference types such as generics as well as nested items
     # (modules, structs, traits, and enums)