Skip to content

Commit

Permalink
Auto merge of #13634 - nyurik:fix-iter-without-into, r=xFrednet,samue…
Browse files Browse the repository at this point in the history
…ltardieu

Cleanup code suggestion for `into_iter_without_iter`

Reorder the suggested code for the `IntoIterator` to match the ordering of the trait declaration:

```rust
impl IntoIterator for ... {
    type Item = ...;
    type IntoIter = ...;
```

changelog: none
  • Loading branch information
bors committed Oct 31, 2024
2 parents 2298a67 + 323f144 commit 8568ca8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion clippy_lints/src/iter_without_into_iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ impl {self_ty_without_ref} {{
let sugg = format!(
"
impl IntoIterator for {self_ty_snippet} {{
type IntoIter = {ret_ty};
type Item = {iter_ty};
type IntoIter = {ret_ty};
fn into_iter(self) -> Self::IntoIter {{
self.iter()
}}
Expand Down
16 changes: 8 additions & 8 deletions tests/ui/iter_without_into_iter.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ help: consider implementing `IntoIterator` for `&S1`
|
LL +
LL + impl IntoIterator for &S1 {
LL + type IntoIter = std::slice::Iter<'_, u8>;
LL + type Item = &u8;
LL + type IntoIter = std::slice::Iter<'_, u8>;
LL + fn into_iter(self) -> Self::IntoIter {
LL + self.iter()
LL + }
Expand All @@ -34,8 +34,8 @@ help: consider implementing `IntoIterator` for `&mut S1`
|
LL +
LL + impl IntoIterator for &mut S1 {
LL + type IntoIter = std::slice::IterMut<'_, u8>;
LL + type Item = &mut u8;
LL + type IntoIter = std::slice::IterMut<'_, u8>;
LL + fn into_iter(self) -> Self::IntoIter {
LL + self.iter()
LL + }
Expand All @@ -55,8 +55,8 @@ help: consider implementing `IntoIterator` for `&S3<'a>`
|
LL +
LL + impl IntoIterator for &S3<'a> {
LL + type IntoIter = std::slice::Iter<'_, u8>;
LL + type Item = &u8;
LL + type IntoIter = std::slice::Iter<'_, u8>;
LL + fn into_iter(self) -> Self::IntoIter {
LL + self.iter()
LL + }
Expand All @@ -76,8 +76,8 @@ help: consider implementing `IntoIterator` for `&mut S3<'a>`
|
LL +
LL + impl IntoIterator for &mut S3<'a> {
LL + type IntoIter = std::slice::IterMut<'_, u8>;
LL + type Item = &mut u8;
LL + type IntoIter = std::slice::IterMut<'_, u8>;
LL + fn into_iter(self) -> Self::IntoIter {
LL + self.iter()
LL + }
Expand All @@ -96,8 +96,8 @@ help: consider implementing `IntoIterator` for `&S8<T>`
|
LL +
LL + impl IntoIterator for &S8<T> {
LL + type IntoIter = std::slice::Iter<'static, T>;
LL + type Item = &T;
LL + type IntoIter = std::slice::Iter<'static, T>;
LL + fn into_iter(self) -> Self::IntoIter {
LL + self.iter()
LL + }
Expand All @@ -117,8 +117,8 @@ help: consider implementing `IntoIterator` for `&S9<T>`
|
LL +
LL + impl IntoIterator for &S9<T> {
LL + type IntoIter = std::slice::Iter<'_, T>;
LL + type Item = &T;
LL + type IntoIter = std::slice::Iter<'_, T>;
LL + fn into_iter(self) -> Self::IntoIter {
LL + self.iter()
LL + }
Expand All @@ -138,8 +138,8 @@ help: consider implementing `IntoIterator` for `&mut S9<T>`
|
LL +
LL + impl IntoIterator for &mut S9<T> {
LL + type IntoIter = std::slice::IterMut<'_, T>;
LL + type Item = &mut T;
LL + type IntoIter = std::slice::IterMut<'_, T>;
LL + fn into_iter(self) -> Self::IntoIter {
LL + self.iter()
LL + }
Expand All @@ -162,8 +162,8 @@ help: consider implementing `IntoIterator` for `&Issue12037`
|
LL ~
LL + impl IntoIterator for &Issue12037 {
LL + type IntoIter = std::slice::Iter<'_, u8>;
LL + type Item = &u8;
LL + type IntoIter = std::slice::Iter<'_, u8>;
LL + fn into_iter(self) -> Self::IntoIter {
LL + self.iter()
LL + }
Expand Down

0 comments on commit 8568ca8

Please sign in to comment.