Merge f084ed2 into 749e897

FuelLabs · Aug 19, 2024 · 76bcf6c · 76bcf6c
2 parents 749e897 + f084ed2
commit 76bcf6c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 16 deletions.
diff --git a/sway-core/src/semantic_analysis/ast_node/declaration/impl_trait.rs b/sway-core/src/semantic_analysis/ast_node/declaration/impl_trait.rs
@@ -831,22 +831,28 @@ fn type_check_trait_implementation(
                         None,
                     ),
                 };
-                trait_type_mapping.extend(&TypeSubstMap::from_type_parameters_and_type_arguments(
-                    vec![type_engine.insert(
-                        engines,
-                        old_type_decl_info1,
-                        type_decl.name.span().source_id(),
-                    )],
-                    vec![type_decl.ty.clone().unwrap().type_id],
-                ));
-                trait_type_mapping.extend(&TypeSubstMap::from_type_parameters_and_type_arguments(
-                    vec![type_engine.insert(
-                        engines,
-                        old_type_decl_info2,
-                        type_decl.name.span().source_id(),
-                    )],
-                    vec![type_decl.ty.clone().unwrap().type_id],
-                ));
+                if let Some(type_arg) = type_decl.ty.clone() {
+                    trait_type_mapping.extend(
+                        &TypeSubstMap::from_type_parameters_and_type_arguments(
+                            vec![type_engine.insert(
+                                engines,
+                                old_type_decl_info1,
+                                type_decl.name.span().source_id(),
+                            )],
+                            vec![type_arg.type_id],
+                        ),
+                    );
+                    trait_type_mapping.extend(
+                        &TypeSubstMap::from_type_parameters_and_type_arguments(
+                            vec![type_engine.insert(
+                                engines,
+                                old_type_decl_info2,
+                                type_decl.name.span().source_id(),
+                            )],
+                            vec![type_arg.type_id],
+                        ),
+                    );
+                }
             }
         }
     }

diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/associated_type_not_in_trait/Forc.lock b/test/src/e2e_vm_tests/test_programs/should_fail/associated_type_not_in_trait/Forc.lock
@@ -0,0 +1,3 @@
+[[package]]
+name = "associated_type_not_in_trait"
+source = "member"
diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/associated_type_not_in_trait/Forc.toml b/test/src/e2e_vm_tests/test_programs/should_fail/associated_type_not_in_trait/Forc.toml
@@ -0,0 +1,6 @@
+[project]
+authors = ["Fuel Labs <contact@fuel.sh>"]
+entry = "main.sw"
+license = "Apache-2.0"
+name = "associated_type_not_in_trait"
+implicit-std = false
diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/associated_type_not_in_trait/src/main.sw b/test/src/e2e_vm_tests/test_programs/should_fail/associated_type_not_in_trait/src/main.sw
@@ -0,0 +1,4 @@
+script;
+trait Trait{}
+struct Struct0{}
+impl Trait for Struct0{type u;const u=0;}
diff --git a/test/src/e2e_vm_tests/test_programs/should_fail/associated_type_not_in_trait/test.toml b/test/src/e2e_vm_tests/test_programs/should_fail/associated_type_not_in_trait/test.toml
@@ -0,0 +1,3 @@
+category = "fail"
+
+# check: $()Type "u" is not a part of trait "Trait"'s interface surface.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		category = "fail"

		# check: $()Type "u" is not a part of trait "Trait"'s interface surface.