nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-23 04:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add comma after struct-like enum variant

Browse Source 
This is mandatory.
This commit is contained in:
Gaëtan Cassiers 2015-07-01 20:49:45 +02:00
parent fc4483748c
commit 83290f15ad
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/items.rs
View File

@ -427,7 +427,7 @@ impl<'a> FmtVisitor<'a> {
self.format_missing_with_indent(field.span.lo);
match field.node.kind {
let result = match field.node.kind {
ast::VariantKind::TupleVariantKind(ref types) => {
let vis = format_visibility(field.node.vis);
self.changes.push_str_span(field.span, vis);
@ -482,23 +482,23 @@ impl<'a> FmtVisitor<'a> {
"Enum variant exceeded column limit");
}
self.changes.push_str_span(field.span, &result);
if !last_field || self.config.enum_trailing_comma {
self.changes.push_str_span(field.span, ",");
}
result
},
ast::VariantKind::StructVariantKind(ref struct_def) => {
let result = self.format_struct("",
field.node.name,
field.node.vis,
struct_def,
None,
field.span,
self.block_indent);
self.changes.push_str_span(field.span, &result)
// TODO Should limit the width, as we have a trailing comma
self.format_struct("",
field.node.name,
field.node.vis,
struct_def,
None,
field.span,
self.block_indent)
}
};
self.changes.push_str_span(field.span, &result);
if !last_field || self.config.enum_trailing_comma {
self.changes.push_str_span(field.span, ",");
}
self.last_pos = field.span.hi + BytePos(1);

5
tests/target/enum.rs
View File

@ -40,5 +40,8 @@ enum StructLikeVariants {
// Pre-comment
#[Attr50]
y: SomeType, // Aanother Comment
}
},
SL {
a: A,
},
}