user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not insert spaces around braces with empty body or multiple lines

Browse source
This commit is contained in:
Seiichi Uchida 2018-05-30 08:20:34 +09:00
parent 966fe8d705
commit 2f65852946
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/macros.rs
View file

@ -493,11 +493,18 @@ fn delim_token_to_str(
delim_token: &DelimToken, delim_token: &DelimToken,
shape: Shape, shape: Shape,
use_multiple_lines: bool, use_multiple_lines: bool,
inner_is_empty: bool,
) -> (String, String) { ) -> (String, String) {
let (lhs, rhs) = match *delim_token { let (lhs, rhs) = match *delim_token {
DelimToken::Paren => ("(", ")"), DelimToken::Paren => ("(", ")"),
DelimToken::Bracket => ("[", "]"), DelimToken::Bracket => ("[", "]"),
DelimToken::Brace => ("{ ", " }"), DelimToken::Brace => {
if inner_is_empty || use_multiple_lines {
("{", "}")
} else {
("{ ", " }")
}
}
DelimToken::NoDelim => ("", ""), DelimToken::NoDelim => ("", ""),
}; };
if use_multiple_lines { if use_multiple_lines {
@ -553,13 +560,13 @@ impl MacroArgKind {
use_multiple_lines: bool, use_multiple_lines: bool,
) -> Option<String> { ) -> Option<String> {
let rewrite_delimited_inner = |delim_tok, args| -> Option<(String, String, String)> { let rewrite_delimited_inner = |delim_tok, args| -> Option<(String, String, String)> {
let (lhs, rhs) = delim_token_to_str(context, delim_tok, shape, false);
let inner = wrap_macro_args(context, args, shape)?; let inner = wrap_macro_args(context, args, shape)?;
let (lhs, rhs) = delim_token_to_str(context, delim_tok, shape, false, inner.is_empty());
if lhs.len() + inner.len() + rhs.len() <= shape.width { if lhs.len() + inner.len() + rhs.len() <= shape.width {
return Some((lhs, inner, rhs)); return Some((lhs, inner, rhs));
} }
let (lhs, rhs) = delim_token_to_str(context, delim_tok, shape, true); let (lhs, rhs) = delim_token_to_str(context, delim_tok, shape, true, false);
let nested_shape = shape let nested_shape = shape
.block_indent(context.config.tab_spaces()) .block_indent(context.config.tab_spaces())
.with_max_width(context.config); .with_max_width(context.config);