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

Direct format vec! instead of using rewrite_pair

Browse source
This commit is contained in:
topecongiro 2017-06-14 20:33:54 +09:00
parent b34ac92f86
commit 8955eb86e6
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/macros.rs
View file

@ -30,7 +30,7 @@ use syntax::util::ThinVec;
use Shape;
use codemap::SpanUtils;
use rewrite::{Rewrite, RewriteContext};
use expr::{rewrite_call, rewrite_array, rewrite_pair};
use expr::{rewrite_call, rewrite_array};
use comment::{FindUncommented, contains_comment};
use utils::mk_sp;
@ -192,15 +192,28 @@ pub fn rewrite_macro(
} else {
("[", "]")
};
rewrite_pair(
&*expr_vec[0],
&*expr_vec[1],
lbr,
"; ",
rbr,
context,
mac_shape,
).map(|s| format!("{}{}", macro_name, s))
// 6 = `vec!` + `; `
let total_overhead = lbr.len() + rbr.len() + 6;
let lhs = try_opt!(expr_vec[0].rewrite(context, mac_shape));
let rhs = try_opt!(expr_vec[1].rewrite(context, mac_shape));
if !lhs.contains('\n') && !rhs.contains('\n') &&
lhs.len() + rhs.len() + total_overhead <= shape.width
{
Some(format!("{}{}{}; {}{}", macro_name, lbr, lhs, rhs, rbr))
} else {
let nested_indent = shape.indent.block_indent(context.config);
Some(format!(
"{}{}\n{}{};\n{}{}\n{}{}",
macro_name,
lbr,
nested_indent.to_string(context.config),
lhs,
nested_indent.to_string(context.config),
rhs,
shape.indent.to_string(context.config),
rbr
))
}
} else {
// Format macro invocation as array literal.
let rewrite = try_opt!(rewrite_array(