Rollup merge of rust-lang#130522 - GnomedDev:clippy-manual-retain-paths, r=compiler-errors

workingjubilee · web-flow · commit 150994417abf · 2024-09-18T14:32:28.000-07:00
[Clippy] Swap `manual_retain` to use diagnostic items instead of paths Part of rust-lang/rust-clippy#5393, just a chore.
diff --git a/alloc/src/collections/binary_heap/mod.rs b/alloc/src/collections/binary_heap/mod.rs
@@ -959,6 +959,7 @@ impl<T, A: Allocator> BinaryHeap<T, A> {
     /// }
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
+    #[cfg_attr(not(test), rustc_diagnostic_item = "binaryheap_iter")]
     pub fn iter(&self) -> Iter<'_, T> {
         Iter { iter: self.data.iter() }
     }
diff --git a/alloc/src/collections/btree/set.rs b/alloc/src/collections/btree/set.rs
@@ -1132,6 +1132,7 @@ impl<T, A: Allocator + Clone> BTreeSet<T, A> {
     /// assert_eq!(set_iter.next(), None);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
+    #[cfg_attr(not(test), rustc_diagnostic_item = "btreeset_iter")]
     pub fn iter(&self) -> Iter<'_, T> {
         Iter { iter: self.map.keys() }
     }
diff --git a/alloc/src/collections/vec_deque/mod.rs b/alloc/src/collections/vec_deque/mod.rs
@@ -1201,6 +1201,7 @@ impl<T, A: Allocator> VecDeque<T, A> {
     /// assert_eq!(&c[..], b);
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
+    #[cfg_attr(not(test), rustc_diagnostic_item = "vecdeque_iter")]
     pub fn iter(&self) -> Iter<'_, T> {
         let (a, b) = self.as_slices();
         Iter::new(a.iter(), b.iter())
diff --git a/core/src/iter/traits/iterator.rs b/core/src/iter/traits/iterator.rs
@@ -876,6 +876,7 @@ pub trait Iterator {
     #[inline]
     #[stable(feature = "rust1", since = "1.0.0")]
     #[rustc_do_not_const_check]
+    #[cfg_attr(not(test), rustc_diagnostic_item = "iter_filter")]
     fn filter<P>(self, predicate: P) -> Filter<Self, P>
     where
         Self: Sized,
@@ -3412,6 +3413,7 @@ pub trait Iterator {
     /// ```
     #[stable(feature = "iter_copied", since = "1.36.0")]
     #[rustc_do_not_const_check]
+    #[cfg_attr(not(test), rustc_diagnostic_item = "iter_copied")]
     fn copied<'a, T: 'a>(self) -> Copied<Self>
     where
         Self: Sized + Iterator<Item = &'a T>,
@@ -3460,6 +3462,7 @@ pub trait Iterator {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[rustc_do_not_const_check]
+    #[cfg_attr(not(test), rustc_diagnostic_item = "iter_cloned")]
     fn cloned<'a, T: 'a>(self) -> Cloned<Self>
     where
         Self: Sized + Iterator<Item = &'a T>,
diff --git a/core/src/slice/mod.rs b/core/src/slice/mod.rs
@@ -1010,6 +1010,7 @@ impl<T> [T] {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
+    #[cfg_attr(not(test), rustc_diagnostic_item = "slice_iter")]
     pub fn iter(&self) -> Iter<'_, T> {
         Iter::new(self)
     }
diff --git a/core/src/str/mod.rs b/core/src/str/mod.rs
@@ -832,6 +832,7 @@ impl str {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
+    #[cfg_attr(not(test), rustc_diagnostic_item = "str_chars")]
     pub fn chars(&self) -> Chars<'_> {
         Chars { iter: self.as_bytes().iter() }
     }
diff --git a/std/src/collections/hash/set.rs b/std/src/collections/hash/set.rs
@@ -187,6 +187,7 @@ impl<T, S> HashSet<T, S> {
     #[inline]
     #[rustc_lint_query_instability]
     #[stable(feature = "rust1", since = "1.0.0")]
+    #[cfg_attr(not(test), rustc_diagnostic_item = "hashset_iter")]
     pub fn iter(&self) -> Iter<'_, T> {
         Iter { base: self.base.iter() }
     }

Original file line number	Diff line number	Diff line change
`@@ -959,6 +959,7 @@ impl<T, A: Allocator> BinaryHeap<T, A> {`
`959`	`959`	`/// }`
`960`	`960`	/// ```
`961`	`961`	`#[stable(feature = "rust1", since = "1.0.0")]`
	`962`	`+ #[cfg_attr(not(test), rustc_diagnostic_item = "binaryheap_iter")]`
`962`	`963`	`pub fn iter(&self) -> Iter<'_, T> {`
`963`	`964`	`Iter { iter: self.data.iter() }`
`964`	`965`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1132,6 +1132,7 @@ impl<T, A: Allocator + Clone> BTreeSet<T, A> {`
`1132`	`1132`	`/// assert_eq!(set_iter.next(), None);`
`1133`	`1133`	/// ```
`1134`	`1134`	`#[stable(feature = "rust1", since = "1.0.0")]`
	`1135`	`+ #[cfg_attr(not(test), rustc_diagnostic_item = "btreeset_iter")]`
`1135`	`1136`	`pub fn iter(&self) -> Iter<'_, T> {`
`1136`	`1137`	`Iter { iter: self.map.keys() }`
`1137`	`1138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1010,6 +1010,7 @@ impl<T> [T] {`
`1010`	`1010`	/// ```
`1011`	`1011`	`#[stable(feature = "rust1", since = "1.0.0")]`
`1012`	`1012`	`#[inline]`
	`1013`	`+ #[cfg_attr(not(test), rustc_diagnostic_item = "slice_iter")]`
`1013`	`1014`	`pub fn iter(&self) -> Iter<'_, T> {`
`1014`	`1015`	`Iter::new(self)`
`1015`	`1016`	`}`
Original file line number	Diff line number	Diff line change
`@@ -832,6 +832,7 @@ impl str {`
`832`	`832`	/// ```
`833`	`833`	`#[stable(feature = "rust1", since = "1.0.0")]`
`834`	`834`	`#[inline]`
	`835`	`+ #[cfg_attr(not(test), rustc_diagnostic_item = "str_chars")]`
`835`	`836`	`pub fn chars(&self) -> Chars<'_> {`
`836`	`837`	`Chars { iter: self.as_bytes().iter() }`
`837`	`838`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,7 @@ impl<T, S> HashSet<T, S> {`
`187`	`187`	`#[inline]`
`188`	`188`	`#[rustc_lint_query_instability]`
`189`	`189`	`#[stable(feature = "rust1", since = "1.0.0")]`
	`190`	`+ #[cfg_attr(not(test), rustc_diagnostic_item = "hashset_iter")]`
`190`	`191`	`pub fn iter(&self) -> Iter<'_, T> {`
`191`	`192`	`Iter { base: self.base.iter() }`
`192`	`193`	`}`