Add the CopyTypes trait to DeclarationId

sway-core/src/declaration_engine/declaration_id.rs

@@ -2,6 +2,8 @@ use std::fmt;
 
 use sway_types::{Span, Spanned};
 
+use crate::type_system::{CopyTypes, TypeMapping};
+
 use super::declaration_engine::de_look_up_decl_id;
 
 /// An ID used to refer to an item in the [DeclarationEngine](super::declaration_engine::DeclarationEngine)
@@ -49,6 +51,12 @@ impl Spanned for DeclarationId {
     }
 }
 
+impl CopyTypes for DeclarationId {
+    fn copy_types(&mut self, type_mapping: &TypeMapping) {
+        de_look_up_decl_id(self.clone()).copy_types(type_mapping)
+    }
+}
+
 impl DeclarationId {
     pub(super) fn new(index: usize, span: Span) -> DeclarationId {
         DeclarationId(index, span)

sway-core/src/declaration_engine/declaration_wrapper.rs

@@ -7,6 +7,7 @@ use crate::{
         TypedImplTrait, TypedStorageDeclaration, TypedStructDeclaration, TypedTraitDeclaration,
         TypedTraitFn,
     },
+    type_system::{CopyTypes, TypeMapping},
     CompileError, TypedFunctionDeclaration,
 };
 
@@ -54,6 +55,20 @@ impl fmt::Display for DeclarationWrapper {
     }
 }
 
+impl CopyTypes for DeclarationWrapper {
+    fn copy_types(&mut self, type_mapping: &TypeMapping) {
+        match self {
+            DeclarationWrapper::Unknown => {}
+            DeclarationWrapper::Function(decl) => decl.copy_types(type_mapping),
+            DeclarationWrapper::Trait(decl) => decl.copy_types(type_mapping),
+            DeclarationWrapper::TraitFn(decl) => decl.copy_types(type_mapping),
+            DeclarationWrapper::TraitImpl(decl) => decl.copy_types(type_mapping),
+            DeclarationWrapper::Struct(decl) => decl.copy_types(type_mapping),
+            DeclarationWrapper::Storage(_) => {}
+        }
+    }
+}
+
 impl DeclarationWrapper {
     /// friendly name string used for error reporting.
     fn friendly_name(&self) -> &'static str {