Fix travis and test+stderr files again

Author: flip1995

ci/base-tests.sh

@@ -75,4 +75,4 @@ if [ "${tests_need_reformatting}" == "true" ] ; then
 fi
 
 # switch back to master
-rustup override set master
+# rustup override set master

tests/ui/eta.rs

@@ -9,7 +9,7 @@
 )]
 #![warn(
     clippy::redundant_closure,
-    redundant_closures_for_method_calls,
+    clippy::redundant_closure_for_method_calls,
     clippy::needless_borrow
 )]
 

tests/ui/eta.stderr

@@ -1,16 +1,74 @@
-error: unknown lint: `redundant_closures_for_method_calls`
-  --> $DIR/eta.rs:12:5
+error: redundant closure found
+  --> $DIR/eta.rs:19:27
    |
-LL |     redundant_closures_for_method_calls,
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: did you mean: `clippy::redundant_closure_for_method_calls`
+LL |     let a = Some(1u8).map(|a| foo(a));
+   |                           ^^^^^^^^^^ help: remove closure as shown: `foo`
    |
-   = note: `-D unknown-lints` implied by `-D warnings`
+   = note: `-D clippy::redundant-closure` implied by `-D warnings`
 
-error: unknown lint: `redundant_closures_for_method_calls`
-  --> $DIR/eta.rs:12:5
+error: redundant closure found
+  --> $DIR/eta.rs:20:10
    |
-LL |     redundant_closures_for_method_calls,
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: did you mean: `clippy::redundant_closure_for_method_calls`
+LL |     meta(|a| foo(a));
+   |          ^^^^^^^^^^ help: remove closure as shown: `foo`
 
-error: aborting due to 2 previous errors
+error: redundant closure found
+  --> $DIR/eta.rs:21:27
+   |
+LL |     let c = Some(1u8).map(|a| {1+2; foo}(a));
+   |                           ^^^^^^^^^^^^^^^^^ help: remove closure as shown: `{1+2; foo}`
+
+error: this expression borrows a reference that is immediately dereferenced by the compiler
+  --> $DIR/eta.rs:23:21
+   |
+LL |     all(&[1, 2, 3], &&2, |x, y| below(x, y)); //is adjusted
+   |                     ^^^ help: change this to: `&2`
+   |
+   = note: `-D clippy::needless-borrow` implied by `-D warnings`
+
+error: redundant closure found
+  --> $DIR/eta.rs:30:27
+   |
+LL |     let e = Some(1u8).map(|a| generic(a));
+   |                           ^^^^^^^^^^^^^^ help: remove closure as shown: `generic`
+
+error: redundant closure found
+  --> $DIR/eta.rs:73:51
+   |
+LL |     let e = Some(TestStruct { some_ref: &i }).map(|a| a.foo());
+   |                                                   ^^^^^^^^^^^ help: remove closure as shown: `TestStruct::foo`
+   |
+   = note: `-D clippy::redundant-closure-for-method-calls` implied by `-D warnings`
+
+error: redundant closure found
+  --> $DIR/eta.rs:75:51
+   |
+LL |     let e = Some(TestStruct { some_ref: &i }).map(|a| a.trait_foo());
+   |                                                   ^^^^^^^^^^^^^^^^^ help: remove closure as shown: `TestTrait::trait_foo`
+
+error: redundant closure found
+  --> $DIR/eta.rs:78:42
+   |
+LL |     let e = Some(&mut vec![1, 2, 3]).map(|v| v.clear());
+   |                                          ^^^^^^^^^^^^^ help: remove closure as shown: `std::vec::Vec::clear`
+
+error: redundant closure found
+  --> $DIR/eta.rs:83:29
+   |
+LL |     let e = Some("str").map(|s| s.to_string());
+   |                             ^^^^^^^^^^^^^^^^^ help: remove closure as shown: `std::string::ToString::to_string`
+
+error: redundant closure found
+  --> $DIR/eta.rs:85:27
+   |
+LL |     let e = Some('a').map(|s| s.to_uppercase());
+   |                           ^^^^^^^^^^^^^^^^^^^^ help: remove closure as shown: `char::to_uppercase`
+
+error: redundant closure found
+  --> $DIR/eta.rs:88:65
+   |
+LL |     let e: std::vec::Vec<char> = vec!['a', 'b', 'c'].iter().map(|c| c.to_ascii_uppercase()).collect();
+   |                                                                 ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove closure as shown: `char::to_ascii_uppercase`
+
+error: aborting due to 11 previous errors