Only suggest .copied() for Option right now

3 files changed, 23 insertions, 17 deletions

diff --git a/tests/ui/map_clone.fixed b/tests/ui/map_clone.fixed
index 4991f010547..7ba4ac7d5a3 100644
--- a/tests/ui/map_clone.fixed
+++ b/tests/ui/map_clone.fixed
@@ -4,14 +4,14 @@
 #![allow(clippy::clone_on_copy)]
 #![allow(clippy::missing_docs_in_private_items)]
 #![allow(clippy::redundant_closure)]
-#![feature(iter_copied)]
 
 fn main() {
-    let _: Vec<i8> = vec![5_i8; 6].iter().copied().collect();
+    let _: Vec<i8> = vec![5_i8; 6].iter().cloned().collect();
     let _: Vec<String> = vec![String::new()].iter().cloned().collect();
-    let _: Vec<u32> = vec![42, 43].iter().copied().collect();
+    let _: Vec<u32> = vec![42, 43].iter().cloned().collect();
     let _: Option<u64> = Some(Box::new(16)).map(|b| *b);
-    let _: Vec<u8> = vec![1; 6].iter().copied().collect();
+    let _: Option<u64> = Some(&16).copied();
+    let _: Option<u8> = Some(&1).copied();
 
     // Don't lint these
     let v = vec![5_i8; 6];
diff --git a/tests/ui/map_clone.rs b/tests/ui/map_clone.rs
index 1f18fcf6398..9a7be3da206 100644
--- a/tests/ui/map_clone.rs
+++ b/tests/ui/map_clone.rs
@@ -4,14 +4,14 @@
 #![allow(clippy::clone_on_copy)]
 #![allow(clippy::missing_docs_in_private_items)]
 #![allow(clippy::redundant_closure)]
-#![feature(iter_copied)]
 
 fn main() {
     let _: Vec<i8> = vec![5_i8; 6].iter().map(|x| *x).collect();
     let _: Vec<String> = vec![String::new()].iter().map(|x| x.clone()).collect();
     let _: Vec<u32> = vec![42, 43].iter().map(|&x| x).collect();
     let _: Option<u64> = Some(Box::new(16)).map(|b| *b);
-    let _: Vec<u8> = vec![1; 6].iter().map(|x| x.clone()).collect();
+    let _: Option<u64> = Some(&16).map(|b| *b);
+    let _: Option<u8> = Some(&1).map(|x| x.clone());
 
     // Don't lint these
     let v = vec![5_i8; 6];
diff --git a/tests/ui/map_clone.stderr b/tests/ui/map_clone.stderr
index b1a165a4253..fb0c636d3ba 100644
--- a/tests/ui/map_clone.stderr
+++ b/tests/ui/map_clone.stderr
@@ -1,28 +1,34 @@
-error: You are using an explicit closure for copying elements
-  --> $DIR/map_clone.rs:10:22
+error: You are using an explicit closure for cloning elements
+  --> $DIR/map_clone.rs:9:22
    |
 LL |     let _: Vec<i8> = vec![5_i8; 6].iter().map(|x| *x).collect();
-   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider calling the dedicated `copied` method: `vec![5_i8; 6].iter().copied()`
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider calling the dedicated `cloned` method: `vec![5_i8; 6].iter().cloned()`
    |
    = note: `-D clippy::map-clone` implied by `-D warnings`
 
 error: You are using an explicit closure for cloning elements
-  --> $DIR/map_clone.rs:11:26
+  --> $DIR/map_clone.rs:10:26
    |
 LL |     let _: Vec<String> = vec![String::new()].iter().map(|x| x.clone()).collect();
    |                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider calling the dedicated `cloned` method: `vec![String::new()].iter().cloned()`
 
-error: You are using an explicit closure for copying elements
-  --> $DIR/map_clone.rs:12:23
+error: You are using an explicit closure for cloning elements
+  --> $DIR/map_clone.rs:11:23
    |
 LL |     let _: Vec<u32> = vec![42, 43].iter().map(|&x| x).collect();
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider calling the dedicated `copied` method: `vec![42, 43].iter().copied()`
+   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider calling the dedicated `cloned` method: `vec![42, 43].iter().cloned()`
+
+error: You are using an explicit closure for copying elements
+  --> $DIR/map_clone.rs:13:26
+   |
+LL |     let _: Option<u64> = Some(&16).map(|b| *b);
+   |                          ^^^^^^^^^^^^^^^^^^^^^ help: Consider calling the dedicated `copied` method: `Some(&16).copied()`
 
 error: You are using an explicit closure for copying elements
-  --> $DIR/map_clone.rs:14:22
+  --> $DIR/map_clone.rs:14:25
    |
-LL |     let _: Vec<u8> = vec![1; 6].iter().map(|x| x.clone()).collect();
-   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider calling the dedicated `copied` method: `vec![1; 6].iter().copied()`
+LL |     let _: Option<u8> = Some(&1).map(|x| x.clone());
+   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: Consider calling the dedicated `copied` method: `Some(&1).copied()`
 
 error: You are needlessly cloning iterator elements
   --> $DIR/map_clone.rs:25:29
@@ -30,5 +36,5 @@ error: You are needlessly cloning iterator elements
 LL |     let _ = std::env::args().map(|v| v.clone());
    |                             ^^^^^^^^^^^^^^^^^^^ help: Remove the map call
 
-error: aborting due to 5 previous errors
+error: aborting due to 6 previous errors