Fix clippy::needless_return

Author: Kinrany

chalk-engine/src/logic.rs

@@ -687,7 +687,7 @@ impl<'forest, I: Interner> SolveState<'forest, I> {
                         ex_clause.answer_time.increment();
 
                         // Ok, we've applied the answer to this Strand.
-                        return Ok(());
+                        Ok(())
                     }
 
                     // This answer led nowhere. Give up for now, but of course
@@ -700,7 +700,7 @@ impl<'forest, I: Interner> SolveState<'forest, I> {
 
                         // Now we want to propogate back to the up with `QuantumExceeded`
                         self.unwind_stack();
-                        return Err(RootSearchFail::QuantumExceeded);
+                        Err(RootSearchFail::QuantumExceeded)
                     }
                 }
             }
@@ -749,9 +749,9 @@ impl<'forest, I: Interner> SolveState<'forest, I> {
                 strand.ex_clause.ambiguous = true;
 
                 // Strand is ambigious.
-                return Ok(());
+                Ok(())
             }
-        };
+        }
     }
 
     /// This is called when the selected subgoal for a strand has floundered.
@@ -1224,7 +1224,7 @@ impl<'forest, I: Interner> SolveState<'forest, I> {
 
             // Now we yield with `QuantumExceeded`
             self.unwind_stack();
-            return Err(RootSearchFail::QuantumExceeded);
+            Err(RootSearchFail::QuantumExceeded)
         } else {
             debug!("table part of a cycle");
 
@@ -1267,7 +1267,7 @@ impl<'forest, I: Interner> SolveState<'forest, I> {
             self.forest.tables[table].enqueue_strand(active_strand);
 
             // The strand isn't active, but the table is, so just continue
-            return Ok(());
+            Ok(())
         }
     }
 

chalk-solve/src/infer/unify.rs

@@ -760,9 +760,7 @@ impl<'t, I: Interner> Unifier<'t, I> {
     ) -> Lifetime<I> {
         let interner = self.interner;
         match lifetime.data(interner) {
-            LifetimeData::BoundVar(_) => {
-                return lifetime.clone();
-            }
+            LifetimeData::BoundVar(_) => lifetime.clone(),
             _ => {
                 if matches!(variance, Variance::Invariant) {
                     lifetime.clone()
@@ -779,9 +777,7 @@ impl<'t, I: Interner> Unifier<'t, I> {
         let interner = self.interner;
         let data = const_.data(interner);
         match data.value {
-            ConstValue::BoundVar(_) => {
-                return const_.clone();
-            }
+            ConstValue::BoundVar(_) => const_.clone(),
             _ => {
                 let ena_var = self.table.new_variable(universe_index);
                 ena_var.to_const(interner, data.ty.clone())