From 84e5634a1bc542d5cb0b18b9266b3fd5522bfd3a Mon Sep 17 00:00:00 2001 From: topecongiro Date: Sun, 6 May 2018 15:14:47 +0900 Subject: [PATCH] Update tests --- Configurations.md | 20 ++++++++++++++++---- tests/target/expr-block.rs | 3 ++- tests/target/expr.rs | 6 ++++-- tests/target/issue-1239.rs | 3 ++- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/Configurations.md b/Configurations.md index c1808a29cbe..07a336d93fa 100644 --- a/Configurations.md +++ b/Configurations.md @@ -64,7 +64,12 @@ fn main() { ```rust fn main() { - if lorem_ipsum && dolor_sit && amet_consectetur && lorem_sit && dolor_consectetur && amet_ipsum + if lorem_ipsum + && dolor_sit + && amet_consectetur + && lorem_sit + && dolor_consectetur + && amet_ipsum && lorem_consectetur { // ... @@ -76,7 +81,12 @@ fn main() { ```rust fn main() { - if lorem_ipsum && dolor_sit && amet_consectetur && lorem_sit && dolor_consectetur && amet_ipsum + if lorem_ipsum + && dolor_sit + && amet_consectetur + && lorem_sit + && dolor_consectetur + && amet_ipsum && lorem_consectetur { // ... @@ -342,7 +352,8 @@ fn main() { let or = foofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoo || barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar; - let sum = 123456789012345678901234567890 + 123456789012345678901234567890 + let sum = 123456789012345678901234567890 + + 123456789012345678901234567890 + 123456789012345678901234567890; let range = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -357,7 +368,8 @@ fn main() { let or = foofoofoofoofoofoofoofoofoofoofoofoofoofoofoofoo || barbarbarbarbarbarbarbarbarbarbarbarbarbarbarbar; - let sum = 123456789012345678901234567890 + 123456789012345678901234567890 + + let sum = 123456789012345678901234567890 + + 123456789012345678901234567890 + 123456789012345678901234567890; let range = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.. diff --git a/tests/target/expr-block.rs b/tests/target/expr-block.rs index 2bec429e8c8..859b4562dff 100644 --- a/tests/target/expr-block.rs +++ b/tests/target/expr-block.rs @@ -150,7 +150,8 @@ fn issue_1450() { } fn foo() { - if real_total <= limit && !pre_line_comments + if real_total <= limit + && !pre_line_comments && !items.into_iter().any(|item| item.as_ref().is_multiline()) { DefinitiveListTactic::Horizontal diff --git a/tests/target/expr.rs b/tests/target/expr.rs index 50387731d14..5f12ec3ff7a 100644 --- a/tests/target/expr.rs +++ b/tests/target/expr.rs @@ -21,8 +21,10 @@ fn foo() -> bool { 10000 * 30000000000 + 40000 / 1002200000000 - 50000 * sqrt(-1), trivial_value, ); - (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + a - + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + aaaaa); + (aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + + a + + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + + aaaaa); { for _ in 0..10 {} diff --git a/tests/target/issue-1239.rs b/tests/target/issue-1239.rs index b10afb5cb6c..e950200b15b 100644 --- a/tests/target/issue-1239.rs +++ b/tests/target/issue-1239.rs @@ -3,7 +3,8 @@ fn foo() { || condition__uses_alignment_for_first_if__1 || condition__uses_alignment_for_first_if__2 { - } else if condition__no_alignment_for_later_else__0 || condition__no_alignment_for_later_else__1 + } else if condition__no_alignment_for_later_else__0 + || condition__no_alignment_for_later_else__1 || condition__no_alignment_for_later_else__2 { };