return the local struct span instead of decleration Ident

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

@@ -954,14 +954,16 @@ impl TypedExpression {
 
         // extract the struct name and fields from the type info
         let type_info = look_up_type_id(type_id);
-        let (struct_name, struct_fields) = check!(
+        let struct_fields = check!(
             type_info.expect_struct(&span),
             return err(warnings, errors),
             warnings,
             errors
         );
         let mut struct_fields = struct_fields.clone();
 
+        let struct_name = Ident::new(call_path_binding.inner.suffix.1.clone());
+
         // match up the names with their type annotations from the declaration
         let mut typed_fields_buf = vec![];
         for def_field in struct_fields.iter_mut() {
@@ -1019,7 +1021,7 @@ impl TypedExpression {
         }
         let exp = TypedExpression {
             expression: TypedExpressionVariant::StructExpression {
-                struct_name: struct_name.clone(),
+                struct_name,
                 fields: typed_fields_buf,
             },
             return_type: type_id,

sway-core/src/type_engine/type_info.rs

@@ -1276,14 +1276,11 @@ impl TypeInfo {
     /// and return its contents.
     ///
     /// Returns an error if `self` is not a `TypeInfo::Struct`.
-    pub(crate) fn expect_struct(
-        &self,
-        debug_span: &Span,
-    ) -> CompileResult<(&Ident, &Vec<TypedStructField>)> {
+    pub(crate) fn expect_struct(&self, debug_span: &Span) -> CompileResult<&Vec<TypedStructField>> {
         let warnings = vec![];
         let errors = vec![];
         match self {
-            TypeInfo::Struct { name, fields, .. } => ok((name, fields), warnings, errors),
+            TypeInfo::Struct { fields, .. } => ok(fields, warnings, errors),
             TypeInfo::ErrorRecovery => err(warnings, errors),
             a => err(
                 vec![],