Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-01 07:48:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

feature: Simplfy branch check logics

Browse source 
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
Masato Sogame 2022-08-31 18:29:58 +09:00 committed by Pocket7878
parent a5d2463b1d
commit 5a1b45dcc1
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/ide-assists/src/handlers/convert_two_arm_bool_match_to_matches_macro.rs
View file

@ -26,23 +26,23 @@ pub(crate) fn convert_two_arm_bool_match_to_matches_macro(
) -> Option<()> { ) -> Option<()> {
let match_expr = ctx.find_node_at_offset::<ast::MatchExpr>()?; let match_expr = ctx.find_node_at_offset::<ast::MatchExpr>()?;
let match_arm_list = match_expr.match_arm_list()?; let match_arm_list = match_expr.match_arm_list()?;
if match_arm_list.arms().count() != 2 { let mut arms = match_arm_list.arms();
let first_arm = arms.next()?;
let second_arm = arms.next()?;
if arms.next().is_some() {
cov_mark::hit!(non_two_arm_match); cov_mark::hit!(non_two_arm_match);
return None; return None;
} }
let first_arm = match_arm_list.arms().next()?;
let first_arm_expr = first_arm.expr(); let first_arm_expr = first_arm.expr();
let invert_matches; let invert_matches = if is_bool_literal_expr(&first_arm_expr, true) {
if is_bool_literal_expr(&first_arm_expr, true) { false
invert_matches = false;
} else if is_bool_literal_expr(&first_arm_expr, false) { } else if is_bool_literal_expr(&first_arm_expr, false) {
invert_matches = true; true
} else { } else {
cov_mark::hit!(non_bool_literal_match); cov_mark::hit!(non_bool_literal_match);
return None; return None;
} };
let target_range = ctx.sema.original_range(match_expr.syntax()).range; let target_range = ctx.sema.original_range(match_expr.syntax()).range;
let expr = match_expr.expr()?; let expr = match_expr.expr()?;