squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Allow macro rewrite to fail on rhs

Browse source
This commit is contained in:
topecongiro 2017-05-19 19:30:06 +09:00
parent 13af774e55
commit 520340481d
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/expr.rs
View file

@ -2080,11 +2080,18 @@ pub fn rewrite_assign_rhs<S: Into<String>>(context: &RewriteContext,
0
};
// 1 = space between operator and rhs.
let max_width = try_opt!(shape.width.checked_sub(last_line_width + 1));
let rhs = ex.rewrite(context,
Shape::offset(max_width,
shape.indent,
shape.indent.alignment + last_line_width + 1));
let orig_shape = try_opt!(shape.block_indent(0).offset_left(last_line_width + 1));
let rhs = match ex.node {
ast::ExprKind::Mac(ref mac) => {
match rewrite_macro(mac, None, context, orig_shape, MacroPosition::Expression) {
None if !context.snippet(ex.span).contains("\n") => {
context.snippet(ex.span).rewrite(context, orig_shape)
}
rhs @ _ => rhs,
}
}
_ => ex.rewrite(context, orig_shape),
};
fn count_line_breaks(src: &str) -> usize {
src.chars().filter(|&x| x == '\n').count()