remove if_chain

Author: sbillig

Cargo.lock

@@ -15,7 +15,6 @@ cranelift-entity = "0.115"
 derive_more.workspace = true
 either = "1.13"
 ena = { version = "0.14", features = ["persistent"] }
-if_chain = "1.0"
 indexmap = "2.0"
 itertools = "0.14"
 num-bigint.workspace = true

crates/hir-analysis/Cargo.toml

@@ -7,7 +7,6 @@ use hir::{
     },
     span::DynLazySpan,
 };
-use if_chain::if_chain;
 use smallvec::{SmallVec, smallvec};
 use thin_vec::ThinVec;
 
@@ -715,14 +714,13 @@ where
         _ => None,
     });
 
-    let res = if_chain! {
-        if is_tail && resolve_tail_as_value;
-        if let Ok(res) = bucket.pick(NameDomain::VALUE);
-        then {
-            res.clone()
-        } else {
-            pick_type_domain_from_bucket(parent_res, bucket, path)?
-        }
+    let res = if is_tail
+        && resolve_tail_as_value
+        && let Ok(res) = bucket.pick(NameDomain::VALUE)
+    {
+        res.clone()
+    } else {
+        pick_type_domain_from_bucket(parent_res, bucket, path)?
     };
 
     let r = resolve_name_res(db, &res, parent_ty, path, scope, assumptions)?;

crates/hir-analysis/src/name_resolution/path_resolver.rs

@@ -6,7 +6,6 @@ use hir::{
         params::LazyGenericArgListSpan,
     },
 };
-use if_chain::if_chain;
 use salsa::Update;
 
 use super::{ExprProp, TyChecker};
@@ -198,19 +197,17 @@ impl<'db> Callable<'db> {
             .zip(self.func_def.arg_tys(db).iter())
             .enumerate()
         {
-            if_chain! {
-                if let Some(expected_label) = self.func_def.param_label(db, i);
-                if !expected_label.is_self(db);
-                if Some(expected_label) != given.label;
-                then {
-                    let diag = BodyDiag::CallArgLabelMismatch {
-                        primary: given.label_span.unwrap_or(given.expr_span.clone()),
-                        def_span: self.func_def.name_span(db),
-                        given: given.label,
-                        expected: expected_label,
-                    };
-                    tc.push_diag(diag);
-                }
+            if let Some(expected_label) = self.func_def.param_label(db, i)
+                && !expected_label.is_self(db)
+                && Some(expected_label) != given.label
+            {
+                let diag = BodyDiag::CallArgLabelMismatch {
+                    primary: given.label_span.unwrap_or(given.expr_span.clone()),
+                    def_span: self.func_def.name_span(db),
+                    given: given.label,
+                    expected: expected_label,
+                };
+                tc.push_diag(diag);
             }
 
             let mut expected = expected.instantiate(db, &self.generic_args);

crates/hir-analysis/src/ty/ty_check/callable.rs

@@ -15,7 +15,6 @@ use hir::{
     },
     span::DynLazySpan,
 };
-use if_chain::if_chain;
 use num_bigint::BigUint;
 use rustc_hash::FxHashSet;
 use salsa::Update;
@@ -331,14 +330,12 @@ impl<'db> TyId<'db> {
 
     pub(crate) fn as_enum(self, db: &'db dyn HirAnalysisDb) -> Option<Enum<'db>> {
         let base_ty = self.base_ty(db);
-        if_chain! {
-            if let Some(adt_ref) = base_ty.adt_ref(db);
-            if let AdtRef::Enum(enum_) = adt_ref;
-            then {
-                Some(enum_)
-            } else {
-                None
-            }
+        if let Some(adt_ref) = base_ty.adt_ref(db)
+            && let AdtRef::Enum(enum_) = adt_ref
+        {
+            Some(enum_)
+        } else {
+            None
         }
     }