]> git.lizzy.rs Git - rust.git/commitdiff
Migrate `VariantKind` construction function to associated function.
authorCorey Farwell <coreyf@rwell.org>
Sat, 1 Oct 2016 19:09:27 +0000 (15:09 -0400)
committerCorey Farwell <coreyf@rwell.org>
Mon, 3 Oct 2016 01:58:20 +0000 (21:58 -0400)
src/librustdoc/clean/mod.rs

index 7cde1a9907e9b671a282cf2656823f61b1b2dd02..141a186d1e07e6de682c14ccc5cef86ebd86b527 100644 (file)
@@ -2026,7 +2026,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: struct_def_to_variant_kind(&self.def, cx),
+                kind: VariantKind::from_struct_def(&self.def, cx),
             }),
         }
     }
@@ -2080,13 +2080,15 @@ pub enum VariantKind {
     StructVariant(VariantStruct),
 }
 
-fn struct_def_to_variant_kind(struct_def: &hir::VariantData, cx: &DocContext) -> VariantKind {
-    if struct_def.is_struct() {
-        StructVariant(struct_def.clean(cx))
-    } else if struct_def.is_unit() {
-        CLikeVariant
-    } else {
-        TupleVariant(struct_def.fields().iter().map(|x| x.ty.clean(cx)).collect())
+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() {
+            CLikeVariant
+        } else {
+            TupleVariant(struct_def.fields().iter().map(|x| x.ty.clean(cx)).collect())
+        }
     }
 }