mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give VariantData::Struct named fields, to clairfy recovered.

Browse Source
This commit is contained in:
Alona Enraght-Moony 2023-12-19 22:47:30 +00:00
parent ca2472edd7
commit df30a7a2e4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/items.rs
View File

@ -666,7 +666,7 @@ fn format_variant(
let span = mk_sp(lo, field.span.lo()); let span = mk_sp(lo, field.span.lo());
let variant_body = match field.data { let variant_body = match field.data {
ast::VariantData::Tuple(..) | ast::VariantData::Struct(..) => format_struct( ast::VariantData::Tuple(..) | ast::VariantData::Struct { .. } => format_struct(
&context, &context,
&StructParts::from_variant(field, &context), &StructParts::from_variant(field, &context),
self.block_indent, self.block_indent,
@ -1092,7 +1092,7 @@ fn enum_variant_span(variant: &ast::Variant, context: &RewriteContext<'_>) -> Sp
if let Some(ref anon_const) = variant.disr_expr { if let Some(ref anon_const) = variant.disr_expr {
let span_before_consts = variant.span.until(anon_const.value.span); let span_before_consts = variant.span.until(anon_const.value.span);
let hi = match &variant.data { let hi = match &variant.data {
Struct(..) => context Struct { .. } => context
.snippet_provider .snippet_provider
.span_after_last(span_before_consts, "}"), .span_after_last(span_before_consts, "}"),
Tuple(..) => context Tuple(..) => context
@ -1112,12 +1112,12 @@ fn format_struct(
offset: Indent, offset: Indent,
one_line_width: Option<usize>, one_line_width: Option<usize>,
) -> Option<String> { ) -> Option<String> {
match *struct_parts.def { match struct_parts.def {
ast::VariantData::Unit(..) => format_unit_struct(context, struct_parts, offset), ast::VariantData::Unit(..) => format_unit_struct(context, struct_parts, offset),
ast::VariantData::Tuple(ref fields, _) => { ast::VariantData::Tuple(fields, _) => {
format_tuple_struct(context, struct_parts, fields, offset) format_tuple_struct(context, struct_parts, fields, offset)
} }
ast::VariantData::Struct(ref fields, _) => { ast::VariantData::Struct { fields, .. } => {
format_struct_struct(context, struct_parts, fields, offset, one_line_width) format_struct_struct(context, struct_parts, fields, offset, one_line_width)
} }
} }