Auto merge of #1408 - Xanewok:bump-rustfmt, r=Xanewok

Update Rustfmt to 1.2

In case it's needed by rust-lang/rust#59454.

Author: bors

Cargo.lock

@@ -45,7 +45,7 @@ racer = { version = "2.1.21", default-features = false }
 rand = "0.6"
 rayon = "1"
 rustc_tools_util = "0.1.1"
-rustfmt-nightly = "1.1"
+rustfmt-nightly = "1.2"
 rustc-serialize = "0.3"
 serde = "1.0"
 serde_json = "1.0"

Cargo.toml

@@ -1788,8 +1788,8 @@ fn client_reformat_with_range() {
                 uri: Url::from_file_path(p.root().join("src/main.rs")).unwrap(),
             },
             range: Range {
-                start: Position { line: 2, character: 0 },
-                end: Position { line: 3, character: 0 },
+                start: Position { line: 1, character: 0 },
+                end: Position { line: 2, character: 0 },
             },
             options: FormattingOptions {
                 tab_size: 4,
@@ -1800,8 +1800,17 @@ fn client_reformat_with_range() {
     );
 
     let newline = if cfg!(windows) { "\r\n" } else { "\n" };
-    let formatted = "pub fn main() {\n    let world1 = \"world\";\n    println!(\"Hello, {}!\", world1);\n    let world2 = \"world\";\n    println!(\"Hello, {}!\", world2);\n    let world3 = \"world\";\n    println!(\"Hello, {}!\", world3);\n}\n"
-        .replace("\n", newline);
+    let formatted = r#"pub fn main() {
+    let world1 = "world";
+    println!("Hello, {}!", world1);
+
+// Work around rustfmt#3494
+let world2 = "world"; println!("Hello, {}!", world2);
+let world3 = "world"; println!("Hello, {}!", world3);
+    }
+"#
+    .replace("\r", "")
+    .replace("\n", newline);
 
     assert_eq!(result.unwrap()[0].new_text, formatted);
 }

tests/client.rs

@@ -1,6 +1,8 @@
 pub fn main()
 {
 let world1 = "world"; println!("Hello, {}!", world1);
+
+// Work around rustfmt#3494
 let world2 = "world"; println!("Hello, {}!", world2);
 let world3 = "world"; println!("Hello, {}!", world3);
     }