Forbid line break between if and pattern

This commit is contained in:
topecongiro 2017-06-03 22:44:21 +09:00
parent fef347cb9e
commit a01ad30459

View file

@ -928,6 +928,7 @@ impl<'a> Rewrite for ControlFlow<'a> {
cond,
self.matcher,
self.connector,
self.keyword,
cond_shape))
}
None => String::new(),
@ -1529,6 +1530,7 @@ fn rewrite_pat_expr(context: &RewriteContext,
// Connecting piece between pattern and expression,
// *without* trailing space.
connector: &str,
keyword: &str,
shape: Shape)
-> Option<String> {
debug!("rewrite_pat_expr {:?} {:?} {:?}", shape, pat, expr);
@ -1567,6 +1569,10 @@ fn rewrite_pat_expr(context: &RewriteContext,
}
}
if pat.is_none() && keyword == "if" {
return None;
}
let nested_indent = shape.indent.block_only().block_indent(context.config);
// The expression won't fit on the current line, jump to next.