Move monomorphization conceptually inside of the type engine

sway-core/src/semantic_analysis/ast_node/declaration.rs

@@ -2,7 +2,6 @@ mod abi;
 mod r#enum;
 mod function;
 mod impl_trait;
-mod monomorphize;
 mod storage;
 mod r#struct;
 mod r#trait;
@@ -11,7 +10,6 @@ mod variable;
 pub use abi::*;
 pub use function::*;
 pub use impl_trait::*;
-pub(crate) use monomorphize::*;
 pub use r#enum::*;
 pub use r#struct::*;
 pub use r#trait::*;

sway-core/src/semantic_analysis/ast_node/declaration/enum.rs

@@ -1,11 +1,10 @@
 use crate::{
     error::*,
-    namespace::*,
     parse_tree::*,
     semantic_analysis::*,
     type_engine::{
-        insert_type, look_up_type_id, CopyTypes, CreateTypeId, ReplaceSelfType, TypeId,
-        TypeMapping, TypeParameter,
+        insert_type, look_up_type_id, CopyTypes, CreateTypeId, EnforceTypeArguments,
+        MonomorphizeHelper, ReplaceSelfType, TypeId, TypeMapping, TypeParameter,
     },
     types::{JsonAbiString, ToJsonAbi},
     TypeInfo,
@@ -63,19 +62,13 @@ impl Spanned for TypedEnumDeclaration {
 }
 
 impl MonomorphizeHelper for TypedEnumDeclaration {
-    type Output = TypedEnumDeclaration;
-
     fn type_parameters(&self) -> &[TypeParameter] {
         &self.type_parameters
     }
 
     fn name(&self) -> &Ident {
         &self.name
     }
-
-    fn monomorphize_inner(self, type_mapping: &TypeMapping, namespace: &mut Items) -> Self::Output {
-        monomorphize_inner(self, type_mapping, namespace)
-    }
 }
 
 impl TypedEnumDeclaration {

sway-core/src/semantic_analysis/ast_node/declaration/function.rs

@@ -1,9 +1,7 @@
 mod function_parameter;
 pub use function_parameter::*;
 
-use crate::{
-    error::*, namespace::*, parse_tree::*, semantic_analysis::*, style::*, type_engine::*, types::*,
-};
+use crate::{error::*, parse_tree::*, semantic_analysis::*, style::*, type_engine::*, types::*};
 use fuels_types::{Function, Property};
 use sha2::{Digest, Sha256};
 use sway_types::{Ident, Span, Spanned};
@@ -74,25 +72,13 @@ impl Spanned for TypedFunctionDeclaration {
 }
 
 impl MonomorphizeHelper for TypedFunctionDeclaration {
-    type Output = TypedFunctionDeclaration;
-
     fn type_parameters(&self) -> &[TypeParameter] {
         &self.type_parameters
     }
 
     fn name(&self) -> &Ident {
         &self.name
     }
-
-    fn monomorphize_inner(
-        self,
-        type_mapping: &TypeMapping,
-        _namespace: &mut Items,
-    ) -> Self::Output {
-        let mut new_decl = self;
-        new_decl.copy_types(type_mapping);
-        new_decl
-    }
 }
 
 impl ToJsonAbi for TypedFunctionDeclaration {

sway-core/src/semantic_analysis/ast_node/declaration/function/function_parameter.rs

@@ -1,8 +1,8 @@
 use crate::{
     error::ok,
     semantic_analysis::{
-        EnforceTypeArguments, IsConstant, TypeCheckContext, TypedExpression,
-        TypedExpressionVariant, TypedVariableDeclaration, VariableMutability,
+        IsConstant, TypeCheckContext, TypedExpression, TypedExpressionVariant,
+        TypedVariableDeclaration, VariableMutability,
     },
     type_engine::*,
     CompileResult, FunctionParameter, Ident, TypedDeclaration,

sway-core/src/semantic_analysis/ast_node/declaration/struct.rs

@@ -1,6 +1,4 @@
-use crate::{
-    error::*, namespace::*, parse_tree::*, semantic_analysis::*, type_engine::*, types::*,
-};
+use crate::{error::*, parse_tree::*, semantic_analysis::*, type_engine::*, types::*};
 use fuels_types::Property;
 use std::hash::{Hash, Hasher};
 use sway_types::{Ident, Span, Spanned};
@@ -54,19 +52,13 @@ impl Spanned for TypedStructDeclaration {
 }
 
 impl MonomorphizeHelper for TypedStructDeclaration {
-    type Output = TypedStructDeclaration;
-
     fn type_parameters(&self) -> &[TypeParameter] {
         &self.type_parameters
     }
 
     fn name(&self) -> &Ident {
         &self.name
     }
-
-    fn monomorphize_inner(self, type_mapping: &TypeMapping, namespace: &mut Items) -> Self::Output {
-        monomorphize_inner(self, type_mapping, namespace)
-    }
 }
 
 impl TypedStructDeclaration {

sway-core/src/semantic_analysis/ast_node/expression/intrinsic_function.rs

@@ -4,7 +4,7 @@ use sway_types::Span;
 
 use crate::{
     error::{err, ok},
-    semantic_analysis::{EnforceTypeArguments, TypeCheckContext},
+    semantic_analysis::TypeCheckContext,
     type_engine::*,
     types::DeterministicallyAborts,
     CompileError, CompileResult, IntrinsicFunctionKind,

sway-core/src/semantic_analysis/ast_node/expression/match_expression/typed/typed_scrutinee.rs

@@ -2,8 +2,8 @@ use sway_types::{Ident, Span, Spanned};
 
 use crate::{
     error::{err, ok},
-    semantic_analysis::{declaration::EnforceTypeArguments, TypeCheckContext, TypedEnumVariant},
-    type_engine::{insert_type, CreateTypeId, TypeArgument, TypeId},
+    semantic_analysis::{TypeCheckContext, TypedEnumVariant},
+    type_engine::{insert_type, CreateTypeId, EnforceTypeArguments, TypeArgument, TypeId},
     CompileError, CompileResult, Literal, Scrutinee, StructScrutineeField, TypeInfo,
 };
 
@@ -70,15 +70,20 @@ impl TypedScrutinee {
                     warnings,
                     errors
                 );
-                let struct_decl = check!(
+                let mut struct_decl = check!(
                     unknown_decl.expect_struct().cloned(),
                     return err(warnings, errors),
                     warnings,
                     errors
                 );
                 // monomorphize the struct definition
-                let struct_decl = check!(
-                    ctx.monomorphize(struct_decl, vec!(), EnforceTypeArguments::No, None),
+                check!(
+                    ctx.monomorphize(
+                        &mut struct_decl,
+                        vec!(),
+                        EnforceTypeArguments::No,
+                        &struct_name.span()
+                    ),
                     return err(warnings, errors),
                     warnings,
                     errors
@@ -164,15 +169,20 @@ impl TypedScrutinee {
                     warnings,
                     errors
                 );
-                let enum_decl = check!(
+                let mut enum_decl = check!(
                     unknown_decl.expect_enum().cloned(),
                     return err(warnings, errors),
                     warnings,
                     errors
                 );
                 // monomorphize the enum definition
-                let enum_decl = check!(
-                    ctx.monomorphize(enum_decl, vec!(), EnforceTypeArguments::No, None),
+                check!(
+                    ctx.monomorphize(
+                        &mut enum_decl,
+                        vec!(),
+                        EnforceTypeArguments::No,
+                        &enum_name.span()
+                    ),
                     return err(warnings, errors),
                     warnings,
                     errors

sway-core/src/semantic_analysis/ast_node/expression/typed_expression.rs

@@ -976,17 +976,21 @@ impl TypedExpression {
             warnings,
             errors
         );
-        let struct_decl = check!(
-            unknown_decl.expect_struct(),
+        let mut struct_decl = check!(
+            unknown_decl.expect_struct().cloned(),
             return err(warnings, errors),
             warnings,
             errors
-        )
-        .clone();
+        );
 
         // monomorphize the struct definition
-        let mut struct_decl = check!(
-            ctx.monomorphize(struct_decl, type_arguments, EnforceTypeArguments::No, None),
+        check!(
+            ctx.monomorphize(
+                &mut struct_decl,
+                type_arguments,
+                EnforceTypeArguments::No,
+                &call_path.span()
+            ),
             return err(warnings, errors),
             warnings,
             errors