Rename type_resolve.rs:resolve to resolve_type.

FuelLabs · Oct 8, 2024 · b6dd0a3 · b6dd0a3
1 parent 2ea460f
commit b6dd0a3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/sway-core/src/semantic_analysis/type_check_context.rs b/sway-core/src/semantic_analysis/type_check_context.rs
@@ -29,7 +29,7 @@ use sway_types::{span::Span, Ident, Spanned};
 
 use super::{
     symbol_collection_context::SymbolCollectionContext,
-    type_resolve::{resolve, resolve_call_path, resolve_qualified_call_path},
+    type_resolve::{resolve_call_path, resolve_qualified_call_path, resolve_type},
     GenericShadowingMode,
 };
 
@@ -660,7 +660,7 @@ impl<'a> TypeCheckContext<'a> {
         enforce_type_arguments: EnforceTypeArguments,
         type_info_prefix: Option<&ModulePath>,
     ) -> Result<TypeId, ErrorEmitted> {
-        resolve(
+        resolve_type(
             handler,
             self.engines(),
             self.namespace(),
@@ -738,7 +738,7 @@ impl<'a> TypeCheckContext<'a> {
             .get_items_for_type(self.engines, type_id);
 
         // resolve the type
-        let type_id = resolve(
+        let type_id = resolve_type(
             handler,
             self.engines(),
             self.namespace(),

diff --git a/sway-core/src/semantic_analysis/type_resolve.rs b/sway-core/src/semantic_analysis/type_resolve.rs
@@ -20,7 +20,7 @@ use crate::{
 /// [TypeInfo::Custom] with either a monomorphized struct, monomorphized
 /// enum, or a reference to a type parameter.
 #[allow(clippy::too_many_arguments)]
-pub fn resolve(
+pub fn resolve_type(
     handler: &Handler,
     engines: &Engines,
     namespace: &Namespace,
@@ -81,7 +81,7 @@ pub fn resolve(
             )?
         }
         TypeInfo::Array(mut elem_ty, n) => {
-            elem_ty.type_id = resolve(
+            elem_ty.type_id = resolve_type(
                 handler,
                 engines,
                 namespace,
@@ -106,7 +106,7 @@ pub fn resolve(
             )
         }
         TypeInfo::Slice(mut elem_ty) => {
-            elem_ty.type_id = resolve(
+            elem_ty.type_id = resolve_type(
                 handler,
                 engines,
                 namespace,
@@ -132,7 +132,7 @@ pub fn resolve(
         }
         TypeInfo::Tuple(mut type_arguments) => {
             for type_argument in type_arguments.iter_mut() {
-                type_argument.type_id = resolve(
+                type_argument.type_id = resolve_type(
                     handler,
                     engines,
                     namespace,
@@ -184,7 +184,7 @@ pub fn resolve(
             referenced_type: mut ty,
             to_mutable_value,
         } => {
-            ty.type_id = resolve(
+            ty.type_id = resolve_type(
                 handler,
                 engines,
                 namespace,

diff --git a/sway-core/src/type_system/monomorphization.rs b/sway-core/src/type_system/monomorphization.rs
@@ -11,7 +11,7 @@ use crate::{
         CallPath,
     },
     namespace::ModulePath,
-    semantic_analysis::type_resolve::resolve,
+    semantic_analysis::type_resolve::resolve_type,
     type_system::ast_elements::create_type_id::CreateTypeId,
     EnforceTypeArguments, Engines, Namespace, SubstTypes, SubstTypesContext, TypeArgument, TypeId,
     TypeInfo, TypeParameter, TypeSubstMap,
@@ -118,7 +118,7 @@ where
             }
 
             for type_argument in type_arguments.iter_mut() {
-                type_argument.type_id = resolve(
+                type_argument.type_id = resolve_type(
                     handler,
                     engines,
                     namespace,