Do not add the beginning vert to the match arm

Pass the span after the match's condition expression.
Closes #2554.
This commit is contained in:
Seiichi Uchida 2018-03-23 19:59:38 +09:00
parent 2fbdedbf2f
commit 1e1d9d4afe
2 changed files with 15 additions and 1 deletions

View File

@ -133,13 +133,14 @@ pub fn rewrite_match(
Some(context.snippet(span).to_owned())
}
} else {
let span_after_cond = mk_sp(cond.span.hi(), span.hi());
Some(format!(
"match {}{}{{\n{}{}{}\n{}}}",
cond_str,
block_sep,
inner_attrs_str,
nested_indent_str,
rewrite_match_arms(context, arms, shape, span, open_brace_pos)?,
rewrite_match_arms(context, arms, shape, span_after_cond, open_brace_pos)?,
shape.indent.to_string(context.config),
))
}

View File

@ -0,0 +1,13 @@
// #2554
// Do not add the beginning vert to the first match arm's pattern.
fn main() {
match foo(|_| {
bar(|_| {
//
})
}) {
Ok(()) => (),
Err(_) => (),
}
}