Simlify with matches!()

Author: Veetaha

crates/ra_assists/src/handlers/change_visibility.rs

@@ -30,9 +30,8 @@ pub(crate) fn change_visibility(acc: &mut Assists, ctx: &AssistContext) -> Optio
 }
 
 fn add_vis(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
-    let item_keyword = ctx.token_at_offset().find(|leaf| match leaf.kind() {
-        T![const] | T![fn] | T![mod] | T![struct] | T![enum] | T![trait] => true,
-        _ => false,
+    let item_keyword = ctx.token_at_offset().find(|leaf| {
+        matches!(leaf.kind(), T![const] | T![fn] | T![mod] | T![struct] | T![enum] | T![trait])
     });
 
     let (offset, target) = if let Some(keyword) = item_keyword {
@@ -73,11 +72,7 @@ fn add_vis(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
 
 fn vis_offset(node: &SyntaxNode) -> TextSize {
     node.children_with_tokens()
-        .skip_while(|it| match it.kind() {
-            WHITESPACE | COMMENT | ATTR => true,
-            _ => false,
-        })
-        .next()
+        .find(|it| !matches!(it.kind(), WHITESPACE | COMMENT | ATTR))
         .map(|it| it.text_range().start())
         .unwrap_or_else(|| node.text_range().start())
 }

crates/ra_assists/src/handlers/fix_visibility.rs

@@ -179,11 +179,7 @@ fn target_data_for_def(
 
 fn vis_offset(node: &SyntaxNode) -> TextSize {
     node.children_with_tokens()
-        .skip_while(|it| match it.kind() {
-            WHITESPACE | COMMENT | ATTR => true,
-            _ => false,
-        })
-        .next()
+        .find(|it| !matches!(it.kind(), WHITESPACE | COMMENT | ATTR))
         .map(|it| it.text_range().start())
         .unwrap_or_else(|| node.text_range().start())
 }

crates/ra_assists/src/handlers/merge_match_arms.rs

@@ -81,10 +81,7 @@ pub(crate) fn merge_match_arms(acc: &mut Assists, ctx: &AssistContext) -> Option
 }
 
 fn contains_placeholder(a: &ast::MatchArm) -> bool {
-    match a.pat() {
-        Some(ra_syntax::ast::Pat::PlaceholderPat(..)) => true,
-        _ => false,
-    }
+    matches!(a.pat(), Some(ra_syntax::ast::Pat::PlaceholderPat(..)))
 }
 
 #[cfg(test)]

crates/ra_hir_def/src/nameres.rs

@@ -137,10 +137,7 @@ impl ModuleOrigin {
     }
 
     pub fn is_inline(&self) -> bool {
-        match self {
-            ModuleOrigin::Inline { .. } => true,
-            ModuleOrigin::CrateRoot { .. } | ModuleOrigin::File { .. } => false,
-        }
+        matches!(self, ModuleOrigin::Inline { .. })
     }
 
     /// Returns a node which defines this module.

crates/ra_hir_ty/src/infer/expr.rs

@@ -785,11 +785,7 @@ impl<'a> InferenceContext<'a> {
         for &check_closures in &[false, true] {
             let param_iter = param_tys.iter().cloned().chain(repeat(Ty::Unknown));
             for (&arg, param_ty) in args.iter().zip(param_iter) {
-                let is_closure = match &self.body[arg] {
-                    Expr::Lambda { .. } => true,
-                    _ => false,
-                };
-
+                let is_closure = matches!(&self.body[arg], Expr::Lambda { .. });
                 if is_closure != check_closures {
                     continue;
                 }

crates/ra_hir_ty/src/lib.rs

@@ -620,17 +620,11 @@ pub enum GenericPredicate {
 
 impl GenericPredicate {
     pub fn is_error(&self) -> bool {
-        match self {
-            GenericPredicate::Error => true,
-            _ => false,
-        }
+        matches!(self, GenericPredicate::Error)
     }
 
     pub fn is_implemented(&self) -> bool {
-        match self {
-            GenericPredicate::Implemented(_) => true,
-            _ => false,
-        }
+        matches!(self, GenericPredicate::Implemented(_))
     }
 
     pub fn trait_ref(&self, db: &dyn HirDatabase) -> Option<TraitRef> {

crates/ra_ide/src/inlay_hints.rs

@@ -312,10 +312,8 @@ fn get_string_representation(expr: &ast::Expr) -> Option<String> {
 }
 
 fn is_obvious_param(param_name: &str) -> bool {
-    let is_obvious_param_name = match param_name {
-        "predicate" | "value" | "pat" | "rhs" | "other" => true,
-        _ => false,
-    };
+    let is_obvious_param_name =
+        matches!(param_name, "predicate" | "value" | "pat" | "rhs" | "other");
     param_name.len() == 1 || is_obvious_param_name
 }
 

crates/ra_ide/src/join_lines.rs

@@ -165,10 +165,7 @@ fn join_single_use_tree(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Opti
 }
 
 fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool {
-    match (left, right) {
-        (T![,], T![')']) | (T![,], T![']']) => true,
-        _ => false,
-    }
+    matches!((left, right), (T![,], T![')']) | (T![,], T![']']))
 }
 
 #[cfg(test)]

crates/ra_ide_db/src/symbol_index.rs

@@ -346,10 +346,7 @@ impl Query {
 }
 
 fn is_type(kind: SyntaxKind) -> bool {
-    match kind {
-        STRUCT_DEF | ENUM_DEF | TRAIT_DEF | TYPE_ALIAS_DEF => true,
-        _ => false,
-    }
+    matches!(kind, STRUCT_DEF | ENUM_DEF | TRAIT_DEF | TYPE_ALIAS_DEF)
 }
 
 /// The actual data that is stored in the index. It should be as compact as

crates/ra_mbe/src/parser.rs

@@ -137,10 +137,7 @@ fn eat_fragment_kind<'a>(
 }
 
 fn is_boolean_literal(lit: &tt::Literal) -> bool {
-    match lit.text.as_str() {
-        "true" | "false" => true,
-        _ => false,
-    }
+    matches!(lit.text.as_str(), "true" | "false")
 }
 
 fn parse_repeat(src: &mut TtIter) -> Result<(Option<Separator>, RepeatKind), ExpandError> {