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

Support field-init-shorthand (#1308)

Browse Source
This commit is contained in:
sinkuu 2017-02-13 03:16:11 +09:00 committed by Nick Cameron
parent f2c867d067
commit fad74c8ac9
3 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/expr.rs
View File

@ -1837,22 +1837,27 @@ pub fn type_annotation_separator(config: &Config) -> &str {
fn rewrite_field(context: &RewriteContext, field: &ast::Field, shape: Shape) -> Option<String> {
let name = &field.ident.node.to_string();
let separator = type_annotation_separator(context.config);
let overhead = name.len() + separator.len();
let expr = field.expr.rewrite(context,
Shape::legacy(try_opt!(shape.width.checked_sub(overhead)),
shape.indent + overhead));
if field.is_shorthand {
Some(name.to_string())
} else {
let separator = type_annotation_separator(context.config);
let overhead = name.len() + separator.len();
let expr = field.expr.rewrite(context,
Shape::legacy(try_opt!(shape.width.checked_sub(overhead)),
shape.indent + overhead));
match expr {
Some(e) => Some(format!("{}{}{}", name, separator, e)),
None => {
let expr_offset = shape.indent.block_indent(context.config);
let expr = field.expr.rewrite(context,
Shape::legacy(try_opt!(context.config
.max_width
.checked_sub(expr_offset.width())),
expr_offset));
expr.map(|s| format!("{}:\n{}{}", name, expr_offset.to_string(&context.config), s))
match expr {
Some(e) => Some(format!("{}{}{}", name, separator, e)),
None => {
let expr_offset = shape.indent.block_indent(context.config);
let expr = field.expr
.rewrite(context,
Shape::legacy(try_opt!(context.config
.max_width
.checked_sub(expr_offset.width())),
expr_offset));
expr.map(|s| format!("{}:\n{}{}", name, expr_offset.to_string(&context.config), s))
}
}
}
}

8
tests/source/struct_lits.rs
View File

@ -133,3 +133,11 @@ fn issue835() {
};
MyStruct {}
}
fn field_init_shorthand() {
MyStruct { x, y, z };
MyStruct { x, y, z, .. base };
Foo { aaaaaaaaaa, bbbbbbbb, cccccccccc, dddddddddd, /* a comment */
eeeeeeeee };
Record { ffffffffffffffffffffffffffieldsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa };
}

15
tests/target/struct_lits.rs
View File

@ -169,3 +169,18 @@ fn issue835() {
};
MyStruct {}
}
fn field_init_shorthand() {
MyStruct { x, y, z };
MyStruct { x, y, z, ..base };
Foo {
aaaaaaaaaa,
bbbbbbbb,
cccccccccc,
dddddddddd, // a comment
eeeeeeeee,
};
Record {
ffffffffffffffffffffffffffieldsaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa,
};
}