New upstream version 1.55.0+dfsg1

[rustc.git] / vendor / indexmap / src / set.rs

diff --git a/vendor/indexmap/src/set.rs b/vendor/indexmap/src/set.rs
index aa4e7749532db1c529a7495e65bd7c09c8a62700..66c3da4d3e7edcb7e17826a7b66a67c4e4046de1 100644 (file)
--- a/vendor/indexmap/src/set.rs
+++ b/vendor/indexmap/src/set.rs
@@ -840,7 +840,7 @@ where
     S: BuildHasher,
 {
     fn extend<I: IntoIterator<Item = &'a T>>(&mut self, iterable: I) {
-        let iter = iterable.into_iter().cloned(); // FIXME: use `copied` in Rust 1.36
+        let iter = iterable.into_iter().copied();
         self.extend(iter);
     }
 }
@@ -1560,7 +1560,7 @@ mod tests {
             I1: Iterator<Item = &'a i32>,
             I2: Iterator<Item = i32>,
         {
-            assert!(iter1.cloned().eq(iter2));
+            assert!(iter1.copied().eq(iter2));
         }
 
         let set_a: IndexSet<_> = (0..3).collect();
@@ -1612,8 +1612,7 @@ mod tests {
         let set_c: IndexSet<_> = (0..6).collect();
         let set_d: IndexSet<_> = (3..9).rev().collect();
 
-        // FIXME: #[allow(clippy::eq_op)] in Rust 1.31
-        #[cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints, eq_op))]
+        #[allow(clippy::eq_op)]
         {
             assert_eq!(&set_a & &set_a, set_a);
             assert_eq!(&set_a | &set_a, set_a);