Skip to content

Commit d11855a

Browse files
jyn514jyn514
committed
Rename VariantKind -> Variant
There's no `Variant`, so it seems silly to have `Kind`.
1 parent dd459a2 commit d11855a

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

‎src/librustdoc/clean/mod.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,11 +1840,11 @@ impl Clean<VariantStruct> for rustc_hir::VariantData<'_> {
18401840
impl Clean<Item> for ty::VariantDef {
18411841
fn clean(&self, cx: &DocContext<'_>) -> Item {
18421842
let kind = match self.ctor_kind {
1843-
CtorKind::Const => VariantKind::CLike,
1844-
CtorKind::Fn => VariantKind::Tuple(
1843+
CtorKind::Const => Variant::CLike,
1844+
CtorKind::Fn => Variant::Tuple(
18451845
self.fields.iter().map(|f| cx.tcx.type_of(f.did).clean(cx)).collect(),
18461846
),
1847-
CtorKind::Fictive => VariantKind::Struct(VariantStruct {
1847+
CtorKind::Fictive => Variant::Struct(VariantStruct {
18481848
struct_type: doctree::Plain,
18491849
fields_stripped: false,
18501850
fields: self
@@ -1868,14 +1868,14 @@ impl Clean<Item> for ty::VariantDef {
18681868
}
18691869
}
18701870

1871-
impl Clean<VariantKind> for hir::VariantData<'_> {
1872-
fn clean(&self, cx: &DocContext<'_>) -> VariantKind {
1871+
impl Clean<Variant> for hir::VariantData<'_> {
1872+
fn clean(&self, cx: &DocContext<'_>) -> Variant {
18731873
match self {
1874-
hir::VariantData::Struct(..) => VariantKind::Struct(self.clean(cx)),
1874+
hir::VariantData::Struct(..) => Variant::Struct(self.clean(cx)),
18751875
hir::VariantData::Tuple(..) => {
1876-
VariantKind::Tuple(self.fields().iter().map(|x| x.ty.clean(cx)).collect())
1876+
Variant::Tuple(self.fields().iter().map(|x| x.ty.clean(cx)).collect())
18771877
}
1878-
hir::VariantData::Unit(..) => VariantKind::CLike,
1878+
hir::VariantData::Unit(..) => Variant::CLike,
18791879
}
18801880
}
18811881
}

‎src/librustdoc/clean/types.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ impl Item {
237237
match *self.kind {
238238
StructItem(ref _struct) => Some(_struct.fields_stripped),
239239
UnionItem(ref union) => Some(union.fields_stripped),
240-
VariantItem(VariantKind::Struct(ref vstruct)) => Some(vstruct.fields_stripped),
240+
VariantItem(Variant::Struct(ref vstruct)) => Some(vstruct.fields_stripped),
241241
_ => None,
242242
}
243243
}
@@ -323,7 +323,7 @@ crate enum ItemKind {
323323
/// A method with a body.
324324
MethodItem(Function, Option<hir::Defaultness>),
325325
StructFieldItem(Type),
326-
VariantItem(VariantKind),
326+
VariantItem(Variant),
327327
/// `fn`s from an extern block
328328
ForeignFunctionItem(Function),
329329
/// `static`s from an extern block
@@ -351,7 +351,7 @@ impl ItemKind {
351351
match self {
352352
StructItem(s) => s.fields.iter(),
353353
UnionItem(u) => u.fields.iter(),
354-
VariantItem(VariantKind::Struct(v)) => v.fields.iter(),
354+
VariantItem(Variant::Struct(v)) => v.fields.iter(),
355355
EnumItem(e) => e.variants.iter(),
356356
TraitItem(t) => t.items.iter(),
357357
ImplItem(i) => i.items.iter(),
@@ -1717,7 +1717,7 @@ crate struct Enum {
17171717
}
17181718

17191719
#[derive(Clone, Debug)]
1720-
crate enum VariantKind {
1720+
crate enum Variant {
17211721
CLike,
17221722
Tuple(Vec<Type>),
17231723
Struct(VariantStruct),

‎src/librustdoc/fold.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ crate trait DocFolder: Sized {
5656
VariantItem(i) => {
5757
let i2 = i.clone(); // this clone is small
5858
match i {
59-
VariantKind::Struct(mut j) => {
59+
Variant::Struct(mut j) => {
6060
let num_fields = j.fields.len();
6161
j.fields = j.fields.into_iter().filter_map(|x| self.fold_item(x)).collect();
6262
j.fields_stripped |= num_fields != j.fields.len()
6363
|| j.fields.iter().any(|f| f.is_stripped());
64-
VariantItem(VariantKind::Struct(j))
64+
VariantItem(Variant::Struct(j))
6565
}
6666
_ => VariantItem(i2),
6767
}

‎src/librustdoc/html/render/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3201,8 +3201,8 @@ fn item_enum(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, e: &clean::Enum
32013201
let name = v.name.as_ref().unwrap();
32023202
match *v.kind {
32033203
clean::VariantItem(ref var) => match var {
3204-
clean::VariantKind::CLike => write!(w, "{}", name),
3205-
clean::VariantKind::Tuple(ref tys) => {
3204+
clean::Variant::CLike => write!(w, "{}", name),
3205+
clean::Variant::Tuple(ref tys) => {
32063206
write!(w, "{}(", name);
32073207
for (i, ty) in tys.iter().enumerate() {
32083208
if i > 0 {
@@ -3212,7 +3212,7 @@ fn item_enum(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, e: &clean::Enum
32123212
}
32133213
write!(w, ")");
32143214
}
3215-
clean::VariantKind::Struct(ref s) => {
3215+
clean::Variant::Struct(ref s) => {
32163216
render_struct(w, v, None, s.struct_type, &s.fields, " ", false, cx);
32173217
}
32183218
},
@@ -3249,7 +3249,7 @@ fn item_enum(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, e: &clean::Enum
32493249
id = id,
32503250
name = variant.name.as_ref().unwrap()
32513251
);
3252-
if let clean::VariantItem(clean::VariantKind::Tuple(ref tys)) = *variant.kind {
3252+
if let clean::VariantItem(clean::Variant::Tuple(ref tys)) = *variant.kind {
32533253
write!(w, "(");
32543254
for (i, ty) in tys.iter().enumerate() {
32553255
if i > 0 {
@@ -3263,8 +3263,8 @@ fn item_enum(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, e: &clean::Enum
32633263
document(w, cx, variant, Some(it));
32643264
document_non_exhaustive(w, variant);
32653265

3266-
use crate::clean::VariantKind;
3267-
if let clean::VariantItem(VariantKind::Struct(ref s)) = *variant.kind {
3266+
use crate::clean::Variant;
3267+
if let clean::VariantItem(Variant::Struct(ref s)) = *variant.kind {
32683268
let variant_id = cx.derive_id(format!(
32693269
"{}.{}.fields",
32703270
ItemType::Variant,

‎src/librustdoc/json/conversions.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,9 @@ impl From<clean::VariantStruct> for Struct {
480480
}
481481
}
482482

483-
impl From<clean::VariantKind> for Variant {
484-
fn from(variant: clean::VariantKind) -> Self {
485-
use clean::VariantKind::*;
483+
impl From<clean::Variant> for Variant {
484+
fn from(variant: clean::Variant) -> Self {
485+
use clean::Variant::*;
486486
match variant {
487487
CLike => Variant::Plain,
488488
Tuple(t) => Variant::Tuple(t.into_iter().map(Into::into).collect()),

‎src/librustdoc/passes/stripper.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl<'a> DocFolder for Stripper<'a> {
9494
// implementations of traits are always public.
9595
clean::ImplItem(ref imp) if imp.trait_.is_some() => true,
9696
// Struct variant fields have inherited visibility
97-
clean::VariantItem(clean::VariantKind::Struct(..)) => true,
97+
clean::VariantItem(clean::Variant::Struct(..)) => true,
9898
_ => false,
9999
};
100100

0 commit comments

Comments
 (0)