From d11855a8ceb129c25160a7adb995087fdf799102 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Fri, 15 Jan 2021 01:17:23 -0500 Subject: Rename VariantKind -> Variant There's no `Variant`, so it seems silly to have `Kind`. --- src/librustdoc/html/render/mod.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/librustdoc/html/render') diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 0c9bb78b967..2db89e8a7ca 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -3201,8 +3201,8 @@ fn item_enum(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, e: &clean::Enum let name = v.name.as_ref().unwrap(); match *v.kind { clean::VariantItem(ref var) => match var { - clean::VariantKind::CLike => write!(w, "{}", name), - clean::VariantKind::Tuple(ref tys) => { + clean::Variant::CLike => write!(w, "{}", name), + clean::Variant::Tuple(ref tys) => { write!(w, "{}(", name); for (i, ty) in tys.iter().enumerate() { if i > 0 { @@ -3212,7 +3212,7 @@ fn item_enum(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, e: &clean::Enum } write!(w, ")"); } - clean::VariantKind::Struct(ref s) => { + clean::Variant::Struct(ref s) => { render_struct(w, v, None, s.struct_type, &s.fields, " ", false, cx); } }, @@ -3249,7 +3249,7 @@ fn item_enum(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, e: &clean::Enum id = id, name = variant.name.as_ref().unwrap() ); - if let clean::VariantItem(clean::VariantKind::Tuple(ref tys)) = *variant.kind { + if let clean::VariantItem(clean::Variant::Tuple(ref tys)) = *variant.kind { write!(w, "("); for (i, ty) in tys.iter().enumerate() { if i > 0 { @@ -3263,8 +3263,8 @@ fn item_enum(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, e: &clean::Enum document(w, cx, variant, Some(it)); document_non_exhaustive(w, variant); - use crate::clean::VariantKind; - if let clean::VariantItem(VariantKind::Struct(ref s)) = *variant.kind { + use crate::clean::Variant; + if let clean::VariantItem(Variant::Struct(ref s)) = *variant.kind { let variant_id = cx.derive_id(format!( "{}.{}.fields", ItemType::Variant, -- cgit 1.4.1-3-g733a5