From b70b3b14aa3125fe4f74a6a71fb7a7b7e78ab13f Mon Sep 17 00:00:00 2001
From: uHOOCCOOHu <hooccooh1896@gmail.com>
Date: Sat, 20 Jul 2019 00:50:18 +0800
Subject: [PATCH] Revert global fmt config and use `rustfmt::skip`

---
 rustfmt.toml               |  2 +-
 tests/ui/issue_4266.rs     | 54 ++++++++++++++++++++------------------
 tests/ui/issue_4266.stderr | 16 +++++------
 3 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/rustfmt.toml b/rustfmt.toml
index f1241e74b0a3..797eccdad99e 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -2,5 +2,5 @@ max_width = 120
 comment_width = 100
 match_block_trailing_comma = true
 wrap_comments = true
-edition = "2018"
+
 error_on_line_overflow = true
diff --git a/tests/ui/issue_4266.rs b/tests/ui/issue_4266.rs
index 953879f7bed0..737e718c4c08 100644
--- a/tests/ui/issue_4266.rs
+++ b/tests/ui/issue_4266.rs
@@ -2,37 +2,41 @@
 #![feature(async_await)]
 #![allow(dead_code)]
 
-async fn sink1<'a>(_: &'a str) {} // lint
-async fn sink1_elided(_: &str) {} // ok
+// No edition 2018
+#[rustfmt::skip]
+mod m {
+    async fn sink1<'a>(_: &'a str) {} // lint
+    async fn sink1_elided(_: &str) {} // ok
 
-// lint
-async fn one_to_one<'a>(s: &'a str) -> &'a str {
-    s
-}
+    // lint
+    async fn one_to_one<'a>(s: &'a str) -> &'a str {
+        s
+    }
 
-// ok
-async fn one_to_one_elided(s: &str) -> &str {
-    s
-}
+    // ok
+    async fn one_to_one_elided(s: &str) -> &str {
+        s
+    }
 
-// ok
-async fn all_to_one<'a>(a: &'a str, _b: &'a str) -> &'a str {
-    a
-}
+    // ok
+    async fn all_to_one<'a>(a: &'a str, _b: &'a str) -> &'a str {
+        a
+    }
 
-// async fn unrelated(_: &str, _: &str) {} // Not allowed in async fn
+    // async fn unrelated(_: &str, _: &str) {} // Not allowed in async fn
 
-// #3988
-struct Foo;
-impl Foo {
-    // ok
-    pub async fn foo(&mut self) {}
-}
+    // #3988
+    struct Foo;
+    impl Foo {
+        // ok
+        pub async fn foo(&mut self) {}
+    }
 
-// rust-lang/rust#61115
-// ok
-async fn print(s: &str) {
-    println!("{}", s);
+    // rust-lang/rust#61115
+    // ok
+    async fn print(s: &str) {
+        println!("{}", s);
+    }
 }
 
 fn main() {}
diff --git a/tests/ui/issue_4266.stderr b/tests/ui/issue_4266.stderr
index 8b4e70eb9c22..649d01dca1ef 100644
--- a/tests/ui/issue_4266.stderr
+++ b/tests/ui/issue_4266.stderr
@@ -1,18 +1,18 @@
 error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
-  --> $DIR/issue_4266.rs:5:1
+  --> $DIR/issue_4266.rs:8:5
    |
-LL | async fn sink1<'a>(_: &'a str) {} // lint
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+LL |     async fn sink1<'a>(_: &'a str) {} // lint
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `-D clippy::needless-lifetimes` implied by `-D warnings`
 
 error: explicit lifetimes given in parameter types where they could be elided (or replaced with `'_` if needed by type declaration)
-  --> $DIR/issue_4266.rs:9:1
+  --> $DIR/issue_4266.rs:12:5
    |
-LL | / async fn one_to_one<'a>(s: &'a str) -> &'a str {
-LL | |     s
-LL | | }
-   | |_^
+LL | /     async fn one_to_one<'a>(s: &'a str) -> &'a str {
+LL | |         s
+LL | |     }
+   | |_____^
 
 error: aborting due to 2 previous errors