Update tests

- We no longer normalize number of vertical spaces between statements.
- Add a test

Author: topecongiro

Configurations.md

@@ -164,14 +164,11 @@ fn bar() {
 #### `1`
 ```rust
 fn foo() {
-
     println!("a");
 }
 
 fn bar() {
-
     println!("b");
-
     println!("c");
 }
 ```

tests/source/configs/blank_lines_lower_bound/2.rs

@@ -0,0 +1,26 @@
+// rustfmt-blank_lines_lower_bound: 2
+// rustfmt-blank_lines_upper_bound: 3
+
+#[foo]
+fn foo() {
+    println!("a");
+}
+#[bar]
+#[barbar]
+fn bar() {
+    println!("b");
+    println!("c");
+}
+struct Foo {}
+enum Bar {}
+use std::io;
+extern crate foobar;
+extern crate foo;
+extern crate bar;
+trait Foo = Bar;
+impl Foo {}
+mac!();
+#[temp]
+use std::fs;
+use std::alloc;
+use std::ascii;

tests/target/assignment.rs

@@ -16,6 +16,7 @@ fn main() {
     single_line_fit = 5;
     single_lit_fit >>= 10;
 
+
     // #2791
     let x = 2;
 }

tests/target/configs/blank_lines_lower_bound/2.rs

@@ -0,0 +1,45 @@
+// rustfmt-blank_lines_lower_bound: 2
+// rustfmt-blank_lines_upper_bound: 3
+
+
+#[foo]
+fn foo() {
+    println!("a");
+}
+
+
+#[bar]
+#[barbar]
+fn bar() {
+    println!("b");
+    println!("c");
+}
+
+
+struct Foo {}
+
+
+enum Bar {}
+
+
+use std::io;
+
+
+extern crate bar;
+extern crate foo;
+extern crate foobar;
+
+
+trait Foo = Bar;
+
+
+impl Foo {}
+
+
+mac!();
+
+
+use std::alloc;
+use std::ascii;
+#[temp]
+use std::fs;

tests/target/control-brace-style-always-next-line.rs

@@ -7,24 +7,28 @@ fn main() {
         let bar = ();
     }
 
+
     'label: loop
     // loop comment
     {
         let foo = ();
     }
 
+
     cond = true;
     while cond
     {
         let foo = ();
     }
 
+
     'while_label: while cond
     {
         // while comment
         let foo = ();
     }
 
+
     for obj in iter
     {
         for sub_obj in obj

tests/target/control-brace-style-always-same-line.rs

@@ -4,22 +4,26 @@ fn main() {
         let bar = ();
     }
 
+
     'label: loop
     // loop comment
     {
         let foo = ();
     }
 
+
     cond = true;
     while cond {
         let foo = ();
     }
 
+
     'while_label: while cond {
         // while comment
         let foo = ();
     }
 
+
     for obj in iter {
         for sub_obj in obj {
             'nested_while_label: while cond {

tests/target/else-if-brace-style-always-next-line.rs

@@ -14,8 +14,10 @@ fn main() {
         let bar = ();
     }
 
+
     let a = if 0 > 1 { unreachable!() } else { 0x0 };
 
+
     if true
     {
         let foo = ();

tests/target/else-if-brace-style-always-same-line.rs

@@ -11,8 +11,10 @@ fn main() {
         let bar = ();
     }
 
+
     let a = if 0 > 1 { unreachable!() } else { 0x0 };
 
+
     if true {
         let foo = ();
     } else if false {

tests/target/else-if-brace-style-closing-next-line.rs

@@ -13,8 +13,10 @@ fn main() {
         let bar = ();
     }
 
+
     let a = if 0 > 1 { unreachable!() } else { 0x0 };
 
+
     if true {
         let foo = ();
     }

tests/target/extern.rs

@@ -74,6 +74,7 @@ extern "C" {
         file: *mut FILE,
     ) -> *mut FILE;
 
+
     async fn foo() -> *mut Bar;
     const fn foo() -> *mut Bar;
     unsafe fn foo() -> *mut Bar;

tests/target/multiple.rs

@@ -129,6 +129,7 @@ fn main() {
         println!("{}", i);
     }
 
+
     while true {
         hello();
     }

tests/target/remove_blank_lines.rs

@@ -1,8 +1,10 @@
 fn main() {
     let x = 1;
 
+
     let y = 2;
 
+
     println!("x + y = {}", x + y);
 }
 
@@ -20,9 +22,11 @@ fn bar() {
     let x = 1;
     // comment after statement
 
+
     // comment before statement
     let y = 2;
     let z = 3;
 
+
     println!("x + y + z = {}", x + y + z);
 }