Workaround for rust-lang/rustfmt#3615

Author: projedi

tests/ui/eta.fixed

@@ -178,6 +178,7 @@ fn test_redundant_closure_with_another_closure() {
     let a = Some(1u8).map(closure);
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 fn call<F: FnOnce(&mut String) -> String>(f: F) -> String {
     f(&mut "Hello".to_owned())
@@ -198,6 +199,9 @@ fn test_deref_with_trait_method() {
     let _ = [Bar].iter().map(|s| s.to_string()).collect::<Vec<_>>();;
 =======
 fn make_lazy(f: fn() -> fn(u8) -> u8) -> impl Fn(u8) -> u8 {
+=======
+fn make_lazy(f: impl Fn() -> fn(u8) -> u8) -> impl Fn(u8) -> u8 {
+>>>>>>> Workaround for rust-lang/rustfmt#3615
     // Currently f is called when result of make_lazy is called.
     // If the closure is removed, f will be called when make_lazy itself is
     // called. This changes semantics, so the closure must stay.

tests/ui/eta.rs

@@ -178,7 +178,6 @@ fn test_redundant_closure_with_another_closure() {
     let a = Some(1u8).map(|a| closure(a));
 }
 
-<<<<<<< HEAD
 fn call<F: FnOnce(&mut String) -> String>(f: F) -> String {
     f(&mut "Hello".to_owned())
 }
@@ -196,7 +195,8 @@ impl std::ops::Deref for Bar {
 
 fn test_deref_with_trait_method() {
     let _ = [Bar].iter().map(|s| s.to_string()).collect::<Vec<_>>();;
-fn make_lazy(f: fn() -> fn(u8) -> u8) -> impl Fn(u8) -> u8 {
+
+fn make_lazy(f: impl Fn() -> fn(u8) -> u8) -> impl Fn(u8) -> u8 {
     // Currently f is called when result of make_lazy is called.
     // If the closure is removed, f will be called when make_lazy itself is
     // called. This changes semantics, so the closure must stay.