Migrate `VariantKind` constructor to `Clean` impl.

https://github.com/rust-lang/rust/pull/36903#discussion_r81477884

diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs
index b3e65293a86752da383fc1fc66f899eab5fdf405..a85e0193a97018c41e03a2c129ea47a698b0a45e 100644 (file)
--- a/src/librustdoc/clean/mod.rs
+++ b/src/librustdoc/clean/mod.rs
@@ -2025,7 +2025,7 @@ fn clean(&self, cx: &DocContext) -> Item {
             deprecation: self.depr.clean(cx),
             def_id: cx.map.local_def_id(self.def.id()),
             inner: VariantItem(Variant {
-                kind: VariantKind::from_struct_def(&self.def, cx),
+                kind: self.def.clean(cx),
             }),
         }
     }
@@ -2079,14 +2079,14 @@ pub enum VariantKind {
     StructVariant(VariantStruct),
 }
 
-impl VariantKind {
-    fn from_struct_def(struct_def: &hir::VariantData, cx: &DocContext) -> VariantKind {
-        if struct_def.is_struct() {
-            StructVariant(struct_def.clean(cx))
-        } else if struct_def.is_unit() {
+impl Clean<VariantKind> for hir::VariantData {
+    fn clean(&self, cx: &DocContext) -> VariantKind {
+        if self.is_struct() {
+            StructVariant(self.clean(cx))
+        } else if self.is_unit() {
             CLikeVariant
         } else {
-            TupleVariant(struct_def.fields().iter().map(|x| x.ty.clean(cx)).collect())
+            TupleVariant(self.fields().iter().map(|x| x.ty.clean(cx)).collect())
         }
     }
 }