mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #9894

Browse Source 
9894: internal: use standard test style r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2021-08-14 15:59:47 +00:00 committed by GitHub
commit 5d7ff6efe3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 234 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

468
crates/ide_assists/src/handlers/convert_to_guarded_return.rs
View File

@ -198,28 +198,28 @@ fn convert_inside_fn() {
check_assist(
convert_to_guarded_return,
r#"
fn main() {
bar();
if$0 true {
foo();
fn main() {
bar();
if$0 true {
foo();
// comment
bar();
}
}
"#,
// comment
bar();
}
}
"#,
r#"
fn main() {
bar();
if false {
return;
}
foo();
fn main() {
bar();
if false {
return;
}
foo();
// comment
bar();
}
"#,
// comment
bar();
}
"#,
);
}
@ -228,29 +228,29 @@ fn convert_let_inside_fn() {
check_assist(
convert_to_guarded_return,
r#"
fn main(n: Option<String>) {
bar();
if$0 let Some(n) = n {
foo(n);
fn main(n: Option<String>) {
bar();
if$0 let Some(n) = n {
foo(n);
// comment
bar();
}
}
"#,
// comment
bar();
}
}
"#,
r#"
fn main(n: Option<String>) {
bar();
let n = match n {
Some(it) => it,
_ => return,
};
foo(n);
fn main(n: Option<String>) {
bar();
let n = match n {
Some(it) => it,
_ => return,
};
foo(n);
// comment
bar();
}
"#,
// comment
bar();
}
"#,
);
}
@ -259,21 +259,21 @@ fn convert_if_let_result() {
check_assist(
convert_to_guarded_return,
r#"
fn main() {
if$0 let Ok(x) = Err(92) {
foo(x);
}
}
"#,
fn main() {
if$0 let Ok(x) = Err(92) {
foo(x);
}
}
"#,
r#"
fn main() {
let x = match Err(92) {
Ok(it) => it,
_ => return,
};
foo(x);
}
"#,
fn main() {
let x = match Err(92) {
Ok(it) => it,
_ => return,
};
foo(x);
}
"#,
);
}
@ -282,29 +282,29 @@ fn convert_let_ok_inside_fn() {
check_assist(
convert_to_guarded_return,
r#"
fn main(n: Option<String>) {
bar();
if$0 let Some(n) = n {
foo(n);
fn main(n: Option<String>) {
bar();
if$0 let Some(n) = n {
foo(n);
// comment
bar();
}
}
"#,
// comment
bar();
}
}
"#,
r#"
fn main(n: Option<String>) {
bar();
let n = match n {
Some(it) => it,
_ => return,
};
foo(n);
fn main(n: Option<String>) {
bar();
let n = match n {
Some(it) => it,
_ => return,
};
foo(n);
// comment
bar();
}
"#,
// comment
bar();
}
"#,
);
}
@ -313,29 +313,29 @@ fn convert_let_mut_ok_inside_fn() {
check_assist(
convert_to_guarded_return,
r#"
fn main(n: Option<String>) {
bar();
if$0 let Some(mut n) = n {
foo(n);
fn main(n: Option<String>) {
bar();
if$0 let Some(mut n) = n {
foo(n);
// comment
bar();
}
}
"#,
// comment
bar();
}
}
"#,
r#"
fn main(n: Option<String>) {
bar();
let mut n = match n {
Some(it) => it,
_ => return,
};
foo(n);
fn main(n: Option<String>) {
bar();
let mut n = match n {
Some(it) => it,
_ => return,
};
foo(n);
// comment
bar();
}
"#,
// comment
bar();
}
"#,
);
}
@ -344,29 +344,29 @@ fn convert_let_ref_ok_inside_fn() {
check_assist(
convert_to_guarded_return,
r#"
fn main(n: Option<&str>) {
bar();
if$0 let Some(ref n) = n {
foo(n);
fn main(n: Option<&str>) {
bar();
if$0 let Some(ref n) = n {
foo(n);
// comment
bar();
}
}
"#,
// comment
bar();
}
}
"#,
r#"
fn main(n: Option<&str>) {
bar();
let ref n = match n {
Some(it) => it,
_ => return,
};
foo(n);
fn main(n: Option<&str>) {
bar();
let ref n = match n {
Some(it) => it,
_ => return,
};
foo(n);
// comment
bar();
}
"#,
// comment
bar();
}
"#,
);
}
@ -375,26 +375,26 @@ fn convert_inside_while() {
check_assist(
convert_to_guarded_return,
r#"
fn main() {
while true {
if$0 true {
foo();
bar();
}
}
}
"#,
fn main() {
while true {
if$0 true {
foo();
bar();
}
}
}
"#,
r#"
fn main() {
while true {
if false {
continue;
}
foo();
bar();
}
}
"#,
fn main() {
while true {
if false {
continue;
}
foo();
bar();
}
}
"#,
);
}
@ -403,27 +403,27 @@ fn convert_let_inside_while() {
check_assist(
convert_to_guarded_return,
r#"
fn main() {
while true {
if$0 let Some(n) = n {
foo(n);
bar();
}
}
}
"#,
fn main() {
while true {
if$0 let Some(n) = n {
foo(n);
bar();
}
}
}
"#,
r#"
fn main() {
while true {
let n = match n {
Some(it) => it,
_ => continue,
};
foo(n);
bar();
}
}
"#,
fn main() {
while true {
let n = match n {
Some(it) => it,
_ => continue,
};
foo(n);
bar();
}
}
"#,
);
}
@ -432,26 +432,26 @@ fn convert_inside_loop() {
check_assist(
convert_to_guarded_return,
r#"
fn main() {
loop {
if$0 true {
foo();
bar();
}
}
}
"#,
fn main() {
loop {
if$0 true {
foo();
bar();
}
}
}
"#,
r#"
fn main() {
loop {
if false {
continue;
}
foo();
bar();
}
}
"#,
fn main() {
loop {
if false {
continue;
}
foo();
bar();
}
}
"#,
);
}
@ -460,27 +460,27 @@ fn convert_let_inside_loop() {
check_assist(
convert_to_guarded_return,
r#"
fn main() {
loop {
if$0 let Some(n) = n {
foo(n);
bar();
}
}
}
"#,
fn main() {
loop {
if$0 let Some(n) = n {
foo(n);
bar();
}
}
}
"#,
r#"
fn main() {
loop {
let n = match n {
Some(it) => it,
_ => continue,
};
foo(n);
bar();
}
}
"#,
fn main() {
loop {
let n = match n {
Some(it) => it,
_ => continue,
};
foo(n);
bar();
}
}
"#,
);
}
@ -489,12 +489,12 @@ fn ignore_already_converted_if() {
check_assist_not_applicable(
convert_to_guarded_return,
r#"
fn main() {
if$0 true {
return;
}
}
"#,
fn main() {
if$0 true {
return;
}
}
"#,
);
}
@ -503,14 +503,14 @@ fn ignore_already_converted_loop() {
check_assist_not_applicable(
convert_to_guarded_return,
r#"
fn main() {
loop {
if$0 true {
continue;
}
}
}
"#,
fn main() {
loop {
if$0 true {
continue;
}
}
}
"#,
);
}
@ -519,12 +519,12 @@ fn ignore_return() {
check_assist_not_applicable(
convert_to_guarded_return,
r#"
fn main() {
if$0 true {
return
}
}
"#,
fn main() {
if$0 true {
return
}
}
"#,
);
}
@ -533,14 +533,14 @@ fn ignore_else_branch() {
check_assist_not_applicable(
convert_to_guarded_return,
r#"
fn main() {
if$0 true {
foo();
} else {
bar()
}
}
"#,
fn main() {
if$0 true {
foo();
} else {
bar()
}
}
"#,
);
}
@ -549,13 +549,13 @@ fn ignore_statements_aftert_if() {
check_assist_not_applicable(
convert_to_guarded_return,
r#"
fn main() {
if$0 true {
foo();
}
bar();
}
"#,
fn main() {
if$0 true {
foo();
}
bar();
}
"#,
);
}
@ -564,14 +564,14 @@ fn ignore_statements_inside_if() {
check_assist_not_applicable(
convert_to_guarded_return,
r#"
fn main() {
if false {
if$0 true {
foo();
}
}
}
"#,
fn main() {
if false {
if$0 true {
foo();
}
}
}
"#,
);
}
}