Fix clippy::redundant_pattern_matching

Author: Kinrany

chalk-integration/src/lowering/env.rs

@@ -177,12 +177,12 @@ impl Env<'_> {
     }
 
     pub fn lookup_trait(&self, name: &Identifier) -> LowerResult<TraitId<ChalkIr>> {
-        if let Some(_) = self.parameter_map.get(&name.str) {
+        if let Some(&id) = self.trait_ids.get(&name.str) {
+            Ok(id)
+        } else if self.parameter_map.get(&name.str).is_some()
+            || self.adt_ids.get(&name.str).is_some()
+        {
             Err(RustIrError::NotTrait(name.clone()))
-        } else if let Some(_) = self.adt_ids.get(&name.str) {
-            Err(RustIrError::NotTrait(name.clone()))
-        } else if let Some(id) = self.trait_ids.get(&name.str) {
-            Ok(*id)
         } else {
             Err(RustIrError::InvalidTraitName(name.clone()))
         }

chalk-ir/src/visit.rs

@@ -239,7 +239,7 @@ where
         let interner = visitor.interner();
         match self.kind(interner) {
             TyKind::BoundVar(bound_var) => {
-                if let Some(_) = bound_var.shifted_out_to(outer_binder) {
+                if bound_var.shifted_out_to(outer_binder).is_some() {
                     visitor.visit_free_var(*bound_var, outer_binder)
                 } else {
                     ControlFlow::Continue(())
@@ -320,7 +320,7 @@ impl<I: Interner> SuperVisit<I> for Lifetime<I> {
         let interner = visitor.interner();
         match self.data(interner) {
             LifetimeData::BoundVar(bound_var) => {
-                if let Some(_) = bound_var.shifted_out_to(outer_binder) {
+                if bound_var.shifted_out_to(outer_binder).is_some() {
                     visitor.visit_free_var(*bound_var, outer_binder)
                 } else {
                     ControlFlow::Continue(())
@@ -357,7 +357,7 @@ impl<I: Interner> SuperVisit<I> for Const<I> {
         let interner = visitor.interner();
         match &self.data(interner).value {
             ConstValue::BoundVar(bound_var) => {
-                if let Some(_) = bound_var.shifted_out_to(outer_binder) {
+                if bound_var.shifted_out_to(outer_binder).is_some() {
                     visitor.visit_free_var(*bound_var, outer_binder)
                 } else {
                     ControlFlow::Continue(())