nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-12 00:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix width bug for long patterns in match arms

Browse Source 
Fixes failing test
This commit is contained in:
Nick Cameron 2017-02-24 07:52:46 +13:00
parent a84f42d13c
commit 7ad352239a
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/expr.rs
View File

@ -1229,8 +1229,6 @@ impl Rewrite for ast::Arm {
trimmed_last_line_width(&pats_str))); trimmed_last_line_width(&pats_str)));
let pats_str = format!("{}{}", pats_str, guard_str); let pats_str = format!("{}{}", pats_str, guard_str);
// Where the next text can start.
let line_start = trimmed_last_line_width(&pats_str);
let body = match body.node { let body = match body.node {
ast::ExprKind::Block(ref block) if !is_unsafe_block(block) && ast::ExprKind::Block(ref block) if !is_unsafe_block(block) &&
@ -1249,14 +1247,12 @@ impl Rewrite for ast::Arm {
let alt_block_sep = String::from("\n") + let alt_block_sep = String::from("\n") +
&shape.indent.block_only().to_string(context.config); &shape.indent.block_only().to_string(context.config);
let pat_width = extra_offset(&pats_str, shape);
// Let's try and get the arm body on the same line as the condition. // Let's try and get the arm body on the same line as the condition.
// 4 = ` => `.len() // 4 = ` => `.len()
if shape.width > line_start + comma.len() + 4 { if shape.width > pat_width + comma.len() + 4 {
let arm_shape = let arm_shape =
shape.shrink_left(line_start + 4).unwrap().sub_width(comma.len()).unwrap().block(); shape.shrink_left(pat_width + 4).unwrap().sub_width(comma.len()).unwrap().block();
// TODO
// let offset = Indent::new(shape.indent.block_indent,
// line_start + 4 - shape.indent.block_indent);
let rewrite = nop_block_collapse(body.rewrite(context, arm_shape), arm_shape.width); let rewrite = nop_block_collapse(body.rewrite(context, arm_shape), arm_shape.width);
let is_block = if let ast::ExprKind::Block(..) = body.node { let is_block = if let ast::ExprKind::Block(..) = body.node {
true true
@ -1285,9 +1281,6 @@ impl Rewrite for ast::Arm {
// FIXME: we're doing a second rewrite of the expr; This may not be // FIXME: we're doing a second rewrite of the expr; This may not be
// necessary. // necessary.
// TODO
// let body_budget = try_opt!(shape.width.checked_sub(context.config.tab_spaces));
// let indent = shape.indent.block_only().block_indent(context.config);
let body_shape = try_opt!(shape.sub_width(context.config.tab_spaces)) let body_shape = try_opt!(shape.sub_width(context.config.tab_spaces))
.block_indent(context.config.tab_spaces); .block_indent(context.config.tab_spaces);
let next_line_body = try_opt!(nop_block_collapse(body.rewrite(context, body_shape), let next_line_body = try_opt!(nop_block_collapse(body.rewrite(context, body_shape),
@ -1338,10 +1331,8 @@ fn rewrite_guard(context: &RewriteContext,
// 4 = ` if `, 5 = ` => {` // 4 = ` if `, 5 = ` => {`
let overhead = pattern_width + 4 + 5; let overhead = pattern_width + 4 + 5;
if overhead < shape.width { if overhead < shape.width {
let cond_str = let cond_shape = shape.shrink_left(pattern_width + 4).unwrap().sub_width(5).unwrap();
guard.rewrite(context, let cond_str = guard.rewrite(context, cond_shape);
Shape::legacy(shape.width - overhead,
shape.indent + pattern_width + 4));
if let Some(cond_str) = cond_str { if let Some(cond_str) = cond_str {
return Some(format!(" if {}", cond_str)); return Some(format!(" if {}", cond_str));
} }

5
tests/target/long-match-arms-brace-newline.rs
View File

@ -7,7 +7,10 @@ fn main() {
{ {
aaaaaaaa::Bbbbb::Ccccccccccccc(_, Some(ref x)) if x == aaaaaaaa::Bbbbb::Ccccccccccccc(_, Some(ref x)) if x ==
"aaaaaaaaaaa \ "aaaaaaaaaaa \
aaaaaaa aaaaaa" => Ok(()), aaaaaaa aaaaaa" =>
{
Ok(())
}
_ => Err(x), _ => Err(x),
} }
} }