Add support for tuple struct fields documentation in enums as well
This commit is contained in:
parent
19f30b72b3
commit
2b790944a0
2 changed files with 8 additions and 6 deletions
|
@ -1730,9 +1730,7 @@ impl Clean<Variant> for hir::VariantData<'_> {
|
||||||
fn clean(&self, cx: &mut DocContext<'_>) -> Variant {
|
fn clean(&self, cx: &mut DocContext<'_>) -> Variant {
|
||||||
match self {
|
match self {
|
||||||
hir::VariantData::Struct(..) => Variant::Struct(self.clean(cx)),
|
hir::VariantData::Struct(..) => Variant::Struct(self.clean(cx)),
|
||||||
hir::VariantData::Tuple(..) => {
|
hir::VariantData::Tuple(..) => Variant::Struct(self.clean(cx)),
|
||||||
Variant::Tuple(self.fields().iter().map(|x| x.ty.clean(cx)).collect())
|
|
||||||
}
|
|
||||||
hir::VariantData::Unit(..) => Variant::CLike,
|
hir::VariantData::Unit(..) => Variant::CLike,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1037,8 +1037,9 @@ fn item_enum(w: &mut Buffer, cx: &Context<'_>, it: &clean::Item, e: &clean::Enum
|
||||||
write!(w, "<div class=\"sub-variant\" id=\"{id}\">", id = variant_id);
|
write!(w, "<div class=\"sub-variant\" id=\"{id}\">", id = variant_id);
|
||||||
write!(
|
write!(
|
||||||
w,
|
w,
|
||||||
"<h3>Fields of <b>{name}</b></h3><div>",
|
"<h3>{extra}Fields of <b>{name}</b></h3><div>",
|
||||||
name = variant.name.as_ref().unwrap()
|
extra = if s.struct_type == CtorKind::Fn { "Tuple " } else { "" },
|
||||||
|
name = variant.name.as_ref().unwrap(),
|
||||||
);
|
);
|
||||||
for field in &s.fields {
|
for field in &s.fields {
|
||||||
use crate::clean::StructFieldItem;
|
use crate::clean::StructFieldItem;
|
||||||
|
@ -1509,7 +1510,10 @@ fn render_struct(
|
||||||
if let Some(g) = g {
|
if let Some(g) = g {
|
||||||
write!(w, "{}", print_where_clause(g, cx, 0, false),)
|
write!(w, "{}", print_where_clause(g, cx, 0, false),)
|
||||||
}
|
}
|
||||||
w.write_str(";");
|
// We only want a ";" when we are displaying a tuple struct, not a variant tuple struct.
|
||||||
|
if structhead {
|
||||||
|
w.write_str(";");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
CtorKind::Const => {
|
CtorKind::Const => {
|
||||||
// Needed for PhantomData.
|
// Needed for PhantomData.
|
||||||
|
|
Loading…
Reference in a new issue