Refactored and cleaned up polymorph matching code

Author: IsaacShelton

Diff for: src/resolve/expr/call/infer_impl.rs

@@ -25,29 +25,19 @@ pub fn infer_callee_missing_impl_args(
             continue;
         };
 
-        // TODO: PERFORMANCE: Optimize this and remove unnecessary cloning.
-        // We should really change `match_type` and friends to produce a type match solution
-        // instead of modifying the poly catalog.
         let from_env = caller.impl_params.params.iter().filter(|(_, param_trait)| {
-            let mut catalog_plus_match = catalog.clone();
-
-            if catalog_plus_match
-                .match_types(ctx, &expected_trait.args, &param_trait.args)
+            if catalog
+                .extend_if_match_all_types(ctx, &expected_trait.args, &param_trait.args)
                 .is_err()
             {
                 return false;
             }
 
-            catalog_plus_match
+            catalog
                 .resolver()
                 .resolve_trait(expected_trait)
                 .map_or(false, |expected_trait| {
-                    if param_trait.trait_ref == expected_trait.trait_ref {
-                        *catalog = catalog_plus_match;
-                        true
-                    } else {
-                        false
-                    }
+                    param_trait.trait_ref == expected_trait.trait_ref
                 })
         });
 

Diff for: src/resolve/expr/call/specified_impl.rs

@@ -177,7 +177,7 @@ fn try_register_specified_impl(
         ));
     }
 
-    match catalog.match_types(
+    match catalog.extend_if_match_all_types(
         ctx,
         param_generic_trait.args.as_slice(),
         arg_concrete_trait.args.as_slice(),

Diff for: src/resolve/func_haystack.rs

@@ -158,7 +158,9 @@ impl FuncHaystack {
         argument: &TypedExpr,
         param_type: &asg::Type,
     ) -> bool {
-        catalog.match_type(ctx, param_type, &argument.ty).is_ok()
+        catalog
+            .extend_if_match_type(ctx, param_type, &argument.ty)
+            .is_ok()
     }
 
     fn find_local(

Diff for: src/resolve/func_head.rs

@@ -143,8 +143,8 @@ pub fn resolve_parameters(
     })
 }
 
-pub fn create_func_impl_params<'a>(
-    type_ctx: &ResolveTypeCtx<'a>,
+pub fn create_func_impl_params(
+    type_ctx: &ResolveTypeCtx,
     head: &FuncHead,
 ) -> Result<ImplParams, ResolveError> {
     let mut params = IndexMap::default();