Merge branch 'master' into ironcev/partial-equivalence

Author: ironcev

forc-pkg/src/manifest/mod.rs

@@ -326,6 +326,7 @@ impl DependencyDetails {
         if git.is_none() && (branch.is_some() || tag.is_some() || rev.is_some()) {
             bail!("Details reserved for git sources used without a git field");
         }
+
         Ok(())
     }
 }
@@ -638,13 +639,26 @@ impl PackageManifest {
     /// 1. The project and organization names against a set of reserved/restricted keywords and patterns.
     /// 2. The validity of the details provided. Makes sure that there are no mismatching detail
     ///    declarations (to prevent mixing details specific to certain types).
+    /// 3. The dependencies listed does not have an alias ("package" field) that is the same as package name.
     pub fn validate(&self) -> Result<()> {
         validate_project_name(&self.project.name)?;
         if let Some(ref org) = self.project.organization {
             validate_name(org, "organization name")?;
         }
-        for (_, dependency_details) in self.deps_detailed() {
+        for (dep_name, dependency_details) in self.deps_detailed() {
             dependency_details.validate()?;
+            if dependency_details
+                .package
+                .as_ref()
+                .is_some_and(|package_alias| package_alias == &self.project.name)
+            {
+                bail!(format!("Dependency \"{dep_name}\" declares an alias (\"package\" field) that is the same as project name"))
+            }
+            if dep_name == &self.project.name {
+                bail!(format!(
+                    "Dependency \"{dep_name}\" collides with project name."
+                ))
+            }
         }
         Ok(())
     }
@@ -1666,4 +1680,43 @@ mod tests {
         assert_eq!(original.workspace.members, deserialized.workspace.members);
         assert_eq!(original.workspace.metadata, deserialized.workspace.metadata);
     }
+
+    #[test]
+    fn test_dependency_alias_project_name_collision() {
+        let original_toml = r#"
+        [project]
+        authors = ["Fuel Labs <contact@fuel.sh>"]
+        entry = "main.sw"
+        license = "Apache-2.0"
+        name = "lib_contract_abi"
+
+        [dependencies]
+        lib_contract = { path = "../lib_contract_abi/", package = "lib_contract_abi" }
+        "#;
+
+        let project = PackageManifest::from_string(original_toml.to_string());
+        let err = project.unwrap_err();
+        assert_eq!(err.to_string(), format!("Dependency \"lib_contract\" declares an alias (\"package\" field) that is the same as project name"))
+    }
+
+    #[test]
+    fn test_dependency_name_project_name_collision() {
+        let original_toml = r#"
+        [project]
+        authors = ["Fuel Labs <contact@fuel.sh>"]
+        entry = "main.sw"
+        license = "Apache-2.0"
+        name = "lib_contract"
+
+        [dependencies]
+        lib_contract = { path = "../lib_contract_abi/", package = "lib_contract_abi" }
+        "#;
+
+        let project = PackageManifest::from_string(original_toml.to_string());
+        let err = project.unwrap_err();
+        assert_eq!(
+            err.to_string(),
+            format!("Dependency \"lib_contract\" collides with project name.")
+        )
+    }
 }

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

@@ -77,25 +77,35 @@ pub(crate) fn type_check_method_application(
                     true
                 }
             });
-            handler.append(arg_handler);
+            handler.append(arg_handler.clone());
         }
 
-        args_opt_buf.push_back((arg_opt, needs_second_pass));
+        args_opt_buf.push_back((arg_opt, arg_handler, needs_second_pass));
     }
 
     // resolve the method name to a typed function declaration and type_check
-    let (original_decl_ref, call_path_typeid) = resolve_method_name(
+    let method_result = resolve_method_name(
         handler,
         ctx.by_ref(),
         &method_name_binding,
         args_opt_buf
             .iter()
-            .map(|(arg, _has_errors)| match arg {
+            .map(|(arg, _, _has_errors)| match arg {
                 Some(arg) => arg.return_type,
                 None => type_engine.new_unknown(),
             })
             .collect(),
-    )?;
+    );
+
+    // In case resolve_method_name fails throw argument errors.
+    let (original_decl_ref, call_path_typeid) = if let Err(e) = method_result {
+        for (_, arg_handler, _) in args_opt_buf.iter() {
+            handler.append(arg_handler.clone());
+        }
+        return Err(e);
+    } else {
+        method_result.unwrap()
+    };
 
     let mut fn_ref = monomorphize_method(
         handler,
@@ -120,7 +130,7 @@ pub(crate) fn type_check_method_application(
     // type check the function arguments (2nd pass)
     let mut args_buf = VecDeque::new();
     for (arg, index, arg_opt) in izip!(arguments.iter(), 0.., args_opt_buf.iter().cloned()) {
-        if let (Some(arg), false) = arg_opt {
+        if let (Some(arg), _, false) = arg_opt {
             args_buf.push_back(arg);
         } else {
             // We type check the argument expression again this time throwing out the error.

test/src/e2e_vm_tests/test_programs/should_fail/variable_does_not_exist/Forc.lock

@@ -0,0 +1,8 @@
+[[package]]
+name = "core"
+source = "path+from-root-1C5801B8398D8ED4"
+
+[[package]]
+name = "variable_does_not_exist"
+source = "member"
+dependencies = ["core"]

test/src/e2e_vm_tests/test_programs/should_fail/variable_does_not_exist/Forc.toml

@@ -0,0 +1,9 @@
+[project]
+name = "variable_does_not_exist"
+authors = ["Fuel Labs <contact@fuel.sh>"]
+entry = "main.sw"
+license = "Apache-2.0"
+implicit-std = false
+
+[dependencies]
+core = { path = "../../../../../../sway-lib-core" }

test/src/e2e_vm_tests/test_programs/should_fail/variable_does_not_exist/src/main.sw

@@ -0,0 +1,23 @@
+script;
+
+struct S {}
+
+impl S {
+    fn associated(a: u64, b: u64, c: u64) -> u64 {
+        a + b + c
+    }
+}
+
+fn function(a: u64, b: u64, c: u64) -> u64 {
+    a + b + c
+}
+
+fn main() {
+    let _ = S::associated(x, y, z);
+
+
+    let _ = function(x, y, z);
+
+
+    let _ = x + y + z;
+}

test/src/e2e_vm_tests/test_programs/should_fail/variable_does_not_exist/test.toml

@@ -0,0 +1,31 @@
+category = "fail"
+
+# check: $()let _ = S::associated(x, y, z);
+# nextln:$()Variable "x" does not exist in this scope.
+
+# check: $()let _ = S::associated(x, y, z);
+# nextln:$()Variable "y" does not exist in this scope.
+
+# check: $()let _ = S::associated(x, y, z);
+# nextln:$()Variable "z" does not exist in this scope.
+
+# check: $()let _ = function(x, y, z);
+# nextln:$()Variable "x" does not exist in this scope.
+
+# check: $()let _ = function(x, y, z);
+# nextln:$()Variable "y" does not exist in this scope.
+
+# check: $()let _ = function(x, y, z);
+# nextln:$()Variable "z" does not exist in this scope.
+
+# check: $()let _ = x + y + z;
+# nextln: $()Variable "x" does not exist in this scope.
+
+# check: $()let _ = x + y + z;
+# nextln: $()Variable "y" does not exist in this scope.
+
+# check: $()let _ = x + y + z;
+# nextln: $()No method "add({unknown}, unknown)" found for type "{unknown}".
+
+# check: $()let _ = x + y + z;
+# nextln: $()Variable "z" does not exist in this scope.