Use FromClean for Item, part 2.

Author: nnethercote

src/librustdoc/json/conversions.rs

@@ -22,61 +22,6 @@ use crate::json::JsonRenderer;
 use crate::passes::collect_intra_doc_links::UrlFragment;
 
 impl JsonRenderer<'_> {
-    pub(super) fn convert_item(&self, item: &clean::Item) -> Option<Item> {
-        let deprecation = item.deprecation(self.tcx);
-        let links = self
-            .cache
-            .intra_doc_links
-            .get(&item.item_id)
-            .into_iter()
-            .flatten()
-            .map(|clean::ItemLink { link, page_id, fragment, .. }| {
-                let id = match fragment {
-                    Some(UrlFragment::Item(frag_id)) => *frag_id,
-                    // FIXME: Pass the `UserWritten` segment to JSON consumer.
-                    Some(UrlFragment::UserWritten(_)) | None => *page_id,
-                };
-
-                (String::from(&**link), self.id_from_item_default(id.into()))
-            })
-            .collect();
-        let docs = item.opt_doc_value();
-        let attrs = item.attributes_and_repr(self.tcx, self.cache(), true);
-        let span = item.span(self.tcx);
-        let visibility = item.visibility(self.tcx);
-        let clean::ItemInner { name, item_id, .. } = *item.inner;
-        let id = self.id_from_item(&item);
-        let inner = match item.kind {
-            clean::KeywordItem => return None,
-            clean::StrippedItem(ref inner) => {
-                match &**inner {
-                    // We document stripped modules as with `Module::is_stripped` set to
-                    // `true`, to prevent contained items from being orphaned for downstream users,
-                    // as JSON does no inlining.
-                    clean::ModuleItem(_)
-                        if self.imported_items.contains(&item_id.expect_def_id()) =>
-                    {
-                        item.into_json(self)
-                    }
-                    _ => return None,
-                }
-            }
-            _ => item.into_json(self),
-        };
-        Some(Item {
-            id,
-            crate_id: item_id.krate().as_u32(),
-            name: name.map(|sym| sym.to_string()),
-            span: span.and_then(|span| span.into_json(self)),
-            visibility: visibility.into_json(self),
-            docs,
-            attrs,
-            deprecation: deprecation.into_json(self),
-            inner,
-            links,
-        })
-    }
-
     fn ids(&self, items: &[clean::Item]) -> Vec<Id> {
         items
             .iter()
@@ -146,6 +91,63 @@ where
     }
 }
 
+impl FromClean<clean::Item> for Option<Item> {
+    fn from_clean(item: &clean::Item, renderer: &JsonRenderer<'_>) -> Self {
+        let deprecation = item.deprecation(renderer.tcx);
+        let links = renderer
+            .cache
+            .intra_doc_links
+            .get(&item.item_id)
+            .into_iter()
+            .flatten()
+            .map(|clean::ItemLink { link, page_id, fragment, .. }| {
+                let id = match fragment {
+                    Some(UrlFragment::Item(frag_id)) => *frag_id,
+                    // FIXME: Pass the `UserWritten` segment to JSON consumer.
+                    Some(UrlFragment::UserWritten(_)) | None => *page_id,
+                };
+
+                (String::from(&**link), renderer.id_from_item_default(id.into()))
+            })
+            .collect();
+        let docs = item.opt_doc_value();
+        let attrs = item.attributes_and_repr(renderer.tcx, renderer.cache(), true);
+        let span = item.span(renderer.tcx);
+        let visibility = item.visibility(renderer.tcx);
+        let clean::ItemInner { name, item_id, .. } = *item.inner;
+        let id = renderer.id_from_item(&item);
+        let inner = match item.kind {
+            clean::KeywordItem => return None,
+            clean::StrippedItem(ref inner) => {
+                match &**inner {
+                    // We document stripped modules as with `Module::is_stripped` set to
+                    // `true`, to prevent contained items from being orphaned for downstream users,
+                    // as JSON does no inlining.
+                    clean::ModuleItem(_)
+                        if renderer.imported_items.contains(&item_id.expect_def_id()) =>
+                    {
+                        item.into_json(renderer)
+                    }
+                    _ => return None,
+                }
+            }
+            _ => item.into_json(renderer),
+        };
+        Some(Item {
+            id,
+            crate_id: item_id.krate().as_u32(),
+            name: name.map(|sym| sym.to_string()),
+            span: span.and_then(|span| span.into_json(renderer)),
+            visibility: visibility.into_json(renderer),
+            docs,
+            attrs,
+            deprecation: deprecation.into_json(renderer),
+            inner,
+            links,
+        })
+    }
+}
+
 impl FromClean<clean::Span> for Option<Span> {
     fn from_clean(span: &clean::Span, renderer: &JsonRenderer<'_>) -> Self {
         match span.filename(renderer.sess()) {
@@ -320,7 +322,7 @@ impl FromClean<clean::Item> for ItemEnum {
                 bounds: b.into_json(renderer),
                 type_: Some(t.item_type.as_ref().unwrap_or(&t.type_).into_json(renderer)),
             },
-            // `convert_item` early returns `None` for stripped items and keywords.
+            // `Option<Item>::into_json` early returns `None` for stripped items and keywords.
             KeywordItem => unreachable!(),
             StrippedItem(inner) => {
                 match inner.as_ref() {
@@ -329,7 +331,8 @@ impl FromClean<clean::Item> for ItemEnum {
                         items: renderer.ids(&m.items),
                         is_stripped: true,
                     }),
-                    // `convert_item` early returns `None` for stripped items we're not including
+                    // `Option<Item>::into_json` early returns `None` for stripped items we're not
+                    // including
                     _ => unreachable!(),
                 }
             }

src/librustdoc/json/mod.rs

@@ -234,7 +234,7 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> {
         item.kind.inner_items().for_each(|i| self.item(i).unwrap());
 
         let item_id = item.item_id;
-        if let Some(mut new_item) = self.convert_item(item) {
+        if let Some(mut new_item) = item.into_json(self) {
             let can_be_ignored = match new_item.inner {
                 types::ItemEnum::Trait(ref mut t) => {
                     t.implementations = self.get_trait_implementors(item_id.expect_def_id());