bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide-assists/src/handlers/convert_bool_then.rs')
-rw-r--r--crates/ide-assists/src/handlers/convert_bool_then.rs23
1 files changed, 11 insertions, 12 deletions
diff --git a/crates/ide-assists/src/handlers/convert_bool_then.rs b/crates/ide-assists/src/handlers/convert_bool_then.rs
index d7b7e8d9ca..9d5d3f2237 100644
--- a/crates/ide-assists/src/handlers/convert_bool_then.rs
+++ b/crates/ide-assists/src/handlers/convert_bool_then.rs
@@ -86,12 +86,11 @@ pub(crate) fn convert_if_to_bool_then(acc: &mut Assists, ctx: &AssistContext<'_>
e @ ast::Expr::CallExpr(_) => Some(e.clone()),
_ => None,
};
- if let Some(ast::Expr::CallExpr(call)) = e {
- if let Some(arg_list) = call.arg_list() {
- if let Some(arg) = arg_list.args().next() {
- editor.replace(call.syntax(), arg.syntax());
- }
- }
+ if let Some(ast::Expr::CallExpr(call)) = e
+ && let Some(arg_list) = call.arg_list()
+ && let Some(arg) = arg_list.args().next()
+ {
+ editor.replace(call.syntax(), arg.syntax());
}
});
let edit = editor.finish();
@@ -276,12 +275,12 @@ fn is_invalid_body(
e @ ast::Expr::CallExpr(_) => Some(e.clone()),
_ => None,
};
- if let Some(ast::Expr::CallExpr(call)) = e {
- if let Some(ast::Expr::PathExpr(p)) = call.expr() {
- let res = p.path().and_then(|p| sema.resolve_path(&p));
- if let Some(hir::PathResolution::Def(hir::ModuleDef::Variant(v))) = res {
- return invalid |= v != some_variant;
- }
+ if let Some(ast::Expr::CallExpr(call)) = e
+ && let Some(ast::Expr::PathExpr(p)) = call.expr()
+ {
+ let res = p.path().and_then(|p| sema.resolve_path(&p));
+ if let Some(hir::PathResolution::Def(hir::ModuleDef::Variant(v))) = res {
+ return invalid |= v != some_variant;
}
}
invalid = true