nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-07 22:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format generics on unit struct

Browse Source
This commit is contained in:
topecongiro 2017-11-13 08:02:06 +09:00
parent 8685cdadda
commit c485202907
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/items.rs
View File

@ -911,7 +911,7 @@ fn format_struct(
one_line_width: Option<usize>,
) -> Option<String> {
match *struct_parts.def {
ast::VariantData::Unit(..) => Some(format_unit_struct(struct_parts)),
ast::VariantData::Unit(..) => format_unit_struct(context, struct_parts, offset),
ast::VariantData::Tuple(ref fields, _) => {
format_tuple_struct(context, struct_parts, fields, offset)
}
@ -1088,8 +1088,15 @@ pub fn format_trait(context: &RewriteContext, item: &ast::Item, offset: Indent)
}
}
fn format_unit_struct(p: &StructParts) -> String {
format!("{};", format_header(p.prefix, p.ident, p.vis))
fn format_unit_struct(context: &RewriteContext, p: &StructParts, offset: Indent) -> Option<String> {
let header_str = format_header(p.prefix, p.ident, p.vis);
let generics_str = if let Some(generics) = p.generics {
let shape = Shape::indented(offset, context.config).offset_left(header_str.len())?;
rewrite_generics(context, generics, shape, generics.span)?
} else {
String::new()
};
Some(format!("{}{};", header_str, generics_str))
}
pub fn format_struct_struct(