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

Use field initialization shorthand if possible

Browse Source 
Also this PR fixes a bug that attributes on a shorthand field get removed.
This commit is contained in:
Seiichi Uchida 2018-01-22 13:04:20 +09:00
parent fff59fe8d9
commit fa6892eb63
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/expr.rs
View File

@ -2565,9 +2565,13 @@ pub fn rewrite_field(
if contains_skip(&field.attrs) { if contains_skip(&field.attrs) {
return Some(context.snippet(field.span()).to_owned()); return Some(context.snippet(field.span()).to_owned());
} }
let name = &field.ident.node.to_string(); let mut attrs_str = field.attrs.rewrite(context, shape)?;
if !attrs_str.is_empty() {
attrs_str.push_str(&format!("\n{}", shape.indent.to_string(context.config)));
};
let name = field.ident.node.to_string();
if field.is_shorthand { if field.is_shorthand {
Some(name.to_string()) Some(attrs_str + &name)
} else { } else {
let mut separator = String::from(struct_lit_field_separator(context.config)); let mut separator = String::from(struct_lit_field_separator(context.config));
for _ in 0..prefix_max_width.checked_sub(name.len()).unwrap_or(0) { for _ in 0..prefix_max_width.checked_sub(name.len()).unwrap_or(0) {
@ -2577,12 +2581,8 @@ pub fn rewrite_field(
let expr_shape = shape.offset_left(overhead)?; let expr_shape = shape.offset_left(overhead)?;
let expr = field.expr.rewrite(context, expr_shape); let expr = field.expr.rewrite(context, expr_shape);
let mut attrs_str = field.attrs.rewrite(context, shape)?;
if !attrs_str.is_empty() {
attrs_str.push_str(&format!("\n{}", shape.indent.to_string(context.config)));
};
match expr { match expr {
Some(ref e) if e.as_str() == name => Some(attrs_str + &name),
Some(e) => Some(format!("{}{}{}{}", attrs_str, name, separator, e)), Some(e) => Some(format!("{}{}{}{}", attrs_str, name, separator, e)),
None => { None => {
let expr_offset = shape.indent.block_indent(context.config); let expr_offset = shape.indent.block_indent(context.config);