Skip to content

Improve tmp iterator variable name for convert_for_to_while_let #20979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve tmp iterator variable name for convert_for_to_while_let #20979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions crates/ide-assists/src/handlers/convert_for_to_while_let.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ use crate::{AssistContext, AssistId, Assists};
// ```
// fn main() {
// let x = vec![1, 2, 3];
// let mut tmp = x.into_iter();
// while let Some(v) = tmp.next() {
// let mut iter = x.into_iter();
// while let Some(v) = iter.next() {
// let y = v * 2;
// };
// }
Expand Down Expand Up @@ -74,7 +74,7 @@ pub(crate) fn convert_for_loop_to_while_let(
let mut new_name = suggest_name::NameGenerator::new_from_scope_locals(
ctx.sema.scope(for_loop.syntax()),
);
let tmp_var = new_name.suggest_name("tmp");
let tmp_var = new_name.suggest_name("iter");

let mut_expr = make.let_stmt(
make.ident_pat(false, true, make.name(&tmp_var)).into(),
Expand Down Expand Up @@ -178,8 +178,8 @@ fn main() {
r"
fn main() {
let mut x = vec![1, 2, 3];
let mut tmp = x.into_iter();
while let Some(v) = tmp.next() {
let mut iter = x.into_iter();
while let Some(v) = iter.next() {
v *= 2;
};
}",
Expand Down Expand Up @@ -215,8 +215,8 @@ impl<T> core::iter::Iterator for core::ops::Range<T> {
}

fn main() {
let mut tmp = 0..92;
while let Some(x) = tmp.next() {
let mut iter = 0..92;
while let Some(x) = iter.next() {
print!("{}", x);
}
}"#,
Expand Down Expand Up @@ -270,8 +270,8 @@ impl S {

fn main() {
let x = S;
let mut tmp = x.iter();
while let Some(v) = tmp.next() {
let mut iter = x.iter();
while let Some(v) = iter.next() {
let a = v * 2;
}
}
Expand All @@ -296,8 +296,8 @@ fn main() {
struct NoIterMethod;
fn main() {
let x = NoIterMethod;
let mut tmp = (&x).into_iter();
while let Some(v) = tmp.next() {
let mut iter = (&x).into_iter();
while let Some(v) = iter.next() {
let a = v * 2;
}
}
Expand All @@ -322,8 +322,8 @@ fn main() {
struct NoIterMethod;
fn main() {
let x = NoIterMethod;
let mut tmp = (&mut x).into_iter();
while let Some(v) = tmp.next() {
let mut iter = (&mut x).into_iter();
while let Some(v) = iter.next() {
let a = v * 2;
}
}
Expand Down Expand Up @@ -363,8 +363,8 @@ impl S {

fn main() {
let x = S;
let mut tmp = x.iter_mut();
while let Some(v) = tmp.next() {
let mut iter = x.iter_mut();
while let Some(v) = iter.next() {
let a = v * 2;
}
}
Expand All @@ -388,8 +388,8 @@ fn main() {
fn main() {
let mut x = vec![1, 2, 3];
let y = &mut x;
let mut tmp = y.into_iter();
while let Some(v) = tmp.next() {
let mut iter = y.into_iter();
while let Some(v) = iter.next() {
*v *= 2;
}
}",
Expand All @@ -411,8 +411,8 @@ fn main() {
"#,
r#"
fn main() {
let mut tmp = core::iter::repeat(92).take(1);
while let Some(a) = tmp.next() {
let mut iter = core::iter::repeat(92).take(1);
while let Some(a) = iter.next() {
println!("{}", a);
}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/ide-assists/src/tests/generated.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,8 +473,8 @@ fn main() {
r#####"
fn main() {
let x = vec![1, 2, 3];
let mut tmp = x.into_iter();
while let Some(v) = tmp.next() {
let mut iter = x.into_iter();
while let Some(v) = iter.next() {
let y = v * 2;
};
}
Expand Down