Merge branch 'master' into mut-immutable-composite-types

sway-core/src/semantic_analysis/node_dependencies.rs

@@ -963,7 +963,7 @@ fn decl_name(engines: &Engines, decl: &Declaration) -> Option<DependentSymbol> {
                             }
                         })
                         .collect::<Vec<String>>()
-                        .join(""),
+                        .join(","),
                 )
             } else if decl.trait_name.prefixes.is_empty() {
                 impl_sym(
@@ -986,7 +986,7 @@ fn decl_name(engines: &Engines, decl: &Declaration) -> Option<DependentSymbol> {
                             }
                         })
                         .collect::<Vec<_>>()
-                        .join(""),
+                        .join(","),
                 )
             } else {
                 None

test/src/e2e_vm_tests/test_programs/should_pass/impl_self_dependency_order_conflict/.gitignore

@@ -0,0 +1,2 @@
+out
+target

test/src/e2e_vm_tests/test_programs/should_pass/impl_self_dependency_order_conflict/Forc.lock

@@ -0,0 +1,13 @@
+[[package]]
+name = "core"
+source = "path+from-root-0C133FB33C94FAC1"
+
+[[package]]
+name = "impl_self_dependency_order_conflict"
+source = "member"
+dependencies = ["std"]
+
+[[package]]
+name = "std"
+source = "path+from-root-0C133FB33C94FAC1"
+dependencies = ["core"]

test/src/e2e_vm_tests/test_programs/should_pass/impl_self_dependency_order_conflict/Forc.toml

@@ -0,0 +1,8 @@
+[project]
+entry = "main.sw"
+authors = ["Fuel Labs <contact@fuel.sh>"]
+license = "Apache-2.0"
+name = "impl_self_dependency_order_conflict"
+
+[dependencies]
+std = { path = "../../../reduced_std_libs/sway-lib-std-assert" }

test/src/e2e_vm_tests/test_programs/should_pass/impl_self_dependency_order_conflict/src/foo.sw

@@ -0,0 +1,5 @@
+library;
+
+pub fn foo() -> u32 {
+    1
+}

test/src/e2e_vm_tests/test_programs/should_pass/impl_self_dependency_order_conflict/src/main.sw

@@ -0,0 +1,27 @@
+library;
+
+mod foo;
+use foo::*;
+
+struct S {}
+
+impl S {   //dependency of this impl is overwritten by the next impl
+    fn a() -> u32 { foo() }
+    fn b() {}
+}
+
+impl S {   //this will overwrite the dependency for the previous impl
+    fn ab() {}
+}
+
+fn foo() -> u32 {
+  2
+}
+
+fn main() {}
+
+#[test]
+fn test() {
+  assert_eq(2, S::a());
+}
+

test/src/e2e_vm_tests/test_programs/should_pass/impl_self_dependency_order_conflict/test.toml

@@ -0,0 +1,2 @@
+category = "unit_tests_pass"
+