language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix smaller nitpicks

Browse source
This commit is contained in:
elkowar 2021-08-21 12:02:21 +02:00
parent 7cff930393
commit e47c9743cf
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ide_assists/src/handlers/replace_if_let_with_match.rs
View file

@ -241,7 +241,6 @@ fn pick_pattern_and_expr_order(
(true, true) => return None, (true, true) => return None,
(true, false) => (pat, expr, expr2), (true, false) => (pat, expr, expr2),
(false, true) => (pat2, expr2, expr), (false, true) => (pat2, expr2, expr),
_ if is_sad_pat(sema, &pat2) => (pat, expr, expr2),
_ if is_sad_pat(sema, &pat) => (pat2, expr2, expr), _ if is_sad_pat(sema, &pat) => (pat2, expr2, expr),
(false, false) => (pat, expr, expr2), (false, false) => (pat, expr, expr2),
}, },
@ -251,9 +250,7 @@ fn pick_pattern_and_expr_order(
fn is_empty_expr(expr: &ast::Expr) -> bool { fn is_empty_expr(expr: &ast::Expr) -> bool {
match expr { match expr {
ast::Expr::BlockExpr(expr) => { ast::Expr::BlockExpr(expr) => expr.is_empty(),
expr.statements().next().is_none() && expr.tail_expr().is_none()
}
ast::Expr::TupleExpr(expr) => expr.fields().next().is_none(), ast::Expr::TupleExpr(expr) => expr.fields().next().is_none(),
_ => false, _ => false,
} }
@ -262,12 +259,10 @@ fn is_empty_expr(expr: &ast::Expr) -> bool {
fn binds_name(sema: &hir::Semantics<RootDatabase>, pat: &ast::Pat) -> bool { fn binds_name(sema: &hir::Semantics<RootDatabase>, pat: &ast::Pat) -> bool {
let binds_name_v = |pat| binds_name(&sema, &pat); let binds_name_v = |pat| binds_name(&sema, &pat);
match pat { match pat {
ast::Pat::IdentPat(pat) => { ast::Pat::IdentPat(pat) => !matches!(
match pat.name().and_then(|name| NameClass::classify(sema, &name)) { pat.name().and_then(|name| NameClass::classify(sema, &name)),
Some(NameClass::ConstReference(_)) => false, Some(NameClass::ConstReference(_))
_ => true, ),
}
}
ast::Pat::MacroPat(_) => true, ast::Pat::MacroPat(_) => true,
ast::Pat::OrPat(pat) => pat.pats().any(binds_name_v), ast::Pat::OrPat(pat) => pat.pats().any(binds_name_v),
ast::Pat::SlicePat(pat) => pat.pats().any(binds_name_v), ast::Pat::SlicePat(pat) => pat.pats().any(binds_name_v),