From 7cbc48ae3269eb85639c56f82302c04929a111fa Mon Sep 17 00:00:00 2001 From: topecongiro Date: Mon, 10 Jul 2017 16:52:55 +0900 Subject: [PATCH] Update tests --- tests/source/long-match-arms-brace-newline.rs | 1 + tests/target/configs-control_style-rfc.rs | 7 ++++--- tests/target/long-match-arms-brace-newline.rs | 1 + tests/target/match.rs | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/source/long-match-arms-brace-newline.rs b/tests/source/long-match-arms-brace-newline.rs index 927ada0ffb2..bc5c9deef68 100644 --- a/tests/source/long-match-arms-brace-newline.rs +++ b/tests/source/long-match-arms-brace-newline.rs @@ -1,4 +1,5 @@ // rustfmt-format_strings: true +// rustfmt-force_format_strings: true // rustfmt-max_width: 80 // rustfmt-control_brace_style: AlwaysNextLine diff --git a/tests/target/configs-control_style-rfc.rs b/tests/target/configs-control_style-rfc.rs index 20742da2195..417c33c59f8 100644 --- a/tests/target/configs-control_style-rfc.rs +++ b/tests/target/configs-control_style-rfc.rs @@ -28,9 +28,10 @@ fn issue1656() { match rewrite { Some(ref body_str) if (!body_str.contains('\n') && body_str.len() <= arm_shape.width) || - !context.config.wrap_match_arms() || - (extend && first_line_width(body_str) <= arm_shape.width) || - is_block => { + !context.config.wrap_match_arms() || + (extend && first_line_width(body_str) <= arm_shape.width) || + is_block => + { return None; } _ => {} diff --git a/tests/target/long-match-arms-brace-newline.rs b/tests/target/long-match-arms-brace-newline.rs index 6f4e3a8de21..2a956e5b4d0 100644 --- a/tests/target/long-match-arms-brace-newline.rs +++ b/tests/target/long-match-arms-brace-newline.rs @@ -1,4 +1,5 @@ // rustfmt-format_strings: true +// rustfmt-force_format_strings: true // rustfmt-max_width: 80 // rustfmt-control_brace_style: AlwaysNextLine diff --git a/tests/target/match.rs b/tests/target/match.rs index bd6376f5153..f08c5acc9be 100644 --- a/tests/target/match.rs +++ b/tests/target/match.rs @@ -324,8 +324,8 @@ fn guards() { if foooooooooooooo && barrrrrrrrrrrr => {} aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa if fooooooooooooooooooooo && - (bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb || - cccccccccccccccccccccccccccccccccccccccc) => {} + (bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb || + cccccccccccccccccccccccccccccccccccccccc) => {} } }