From 0692b2bb926a12a01cd4f7362092385498ebd0d0 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-no-reply-9879165716479413131@oli-obk.de>
Date: Sun, 8 Apr 2018 10:55:42 +0200
Subject: [PATCH] Temporarily disable the needless_borrow lint

---
 clippy_lints/src/lib.rs              |  3 +--
 clippy_lints/src/needless_borrow.rs  |  2 +-
 tests/run-pass/needless_borrow_fp.rs | 10 ++++++++++
 tests/ui/eta.rs                      |  2 +-
 tests/ui/needless_borrow.rs          |  4 ++--
 5 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 tests/run-pass/needless_borrow_fp.rs

diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index 64661b1f545b..603054711a00 100644
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -592,7 +592,6 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         mutex_atomic::MUTEX_ATOMIC,
         needless_bool::BOOL_COMPARISON,
         needless_bool::NEEDLESS_BOOL,
-        needless_borrow::NEEDLESS_BORROW,
         needless_borrowed_ref::NEEDLESS_BORROWED_REFERENCE,
         needless_pass_by_value::NEEDLESS_PASS_BY_VALUE,
         needless_update::NEEDLESS_UPDATE,
@@ -771,7 +770,6 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         misc_early::ZERO_PREFIXED_LITERAL,
         needless_bool::BOOL_COMPARISON,
         needless_bool::NEEDLESS_BOOL,
-        needless_borrow::NEEDLESS_BORROW,
         needless_borrowed_ref::NEEDLESS_BORROWED_REFERENCE,
         needless_update::NEEDLESS_UPDATE,
         no_effect::NO_EFFECT,
@@ -872,6 +870,7 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry) {
         attrs::EMPTY_LINE_AFTER_OUTER_ATTR,
         fallible_impl_from::FALLIBLE_IMPL_FROM,
         mutex_atomic::MUTEX_INTEGER,
+        needless_borrow::NEEDLESS_BORROW,
         ranges::RANGE_PLUS_ONE,
     ]);
 }
diff --git a/clippy_lints/src/needless_borrow.rs b/clippy_lints/src/needless_borrow.rs
index a5d89cbcb736..4a6d825130ff 100644
--- a/clippy_lints/src/needless_borrow.rs
+++ b/clippy_lints/src/needless_borrow.rs
@@ -22,7 +22,7 @@ use utils::{in_macro, snippet_opt, span_lint_and_then};
 /// ```
 declare_clippy_lint! {
     pub NEEDLESS_BORROW,
-    complexity,
+    nursery,
     "taking a reference that is going to be automatically dereferenced"
 }
 
diff --git a/tests/run-pass/needless_borrow_fp.rs b/tests/run-pass/needless_borrow_fp.rs
new file mode 100644
index 000000000000..9dc508006eda
--- /dev/null
+++ b/tests/run-pass/needless_borrow_fp.rs
@@ -0,0 +1,10 @@
+#[deny(clippy)]
+
+#[derive(Debug)]
+pub enum Error {
+    Type(
+        &'static str,
+    ),
+}
+
+fn main() {}
diff --git a/tests/ui/eta.rs b/tests/ui/eta.rs
index 0ff02a0b2ccc..e6fad3bb777d 100644
--- a/tests/ui/eta.rs
+++ b/tests/ui/eta.rs
@@ -1,7 +1,7 @@
 
 
 #![allow(unknown_lints, unused, no_effect, redundant_closure_call, many_single_char_names, needless_pass_by_value)]
-#![warn(redundant_closure)]
+#![warn(redundant_closure, needless_borrow)]
 
 fn main() {
     let a = Some(1u8).map(|a| foo(a));
diff --git a/tests/ui/needless_borrow.rs b/tests/ui/needless_borrow.rs
index 99500cd0746d..491194e83b1a 100644
--- a/tests/ui/needless_borrow.rs
+++ b/tests/ui/needless_borrow.rs
@@ -5,7 +5,7 @@ fn x(y: &i32) -> i32 {
     *y
 }
 
-#[warn(clippy)]
+#[warn(clippy, needless_borrow)]
 #[allow(unused_variables)]
 fn main() {
     let a = 5;
@@ -42,7 +42,7 @@ trait Trait {}
 impl<'a> Trait for &'a str {}
 
 fn h(_: &Trait) {}
-
+#[warn(needless_borrow)]
 #[allow(dead_code)]
 fn issue_1432() {
     let mut v = Vec::<String>::new();