fix(recursive packages): Inspect the recursive packages for path dependencies

Author: ibilalkayy

src/cargo/core/resolver/errors.rs

@@ -5,7 +5,7 @@ use std::task::Poll;
 
 use crate::core::{Dependency, PackageId, Registry, Shell, SourceId, Summary};
 use crate::sources::source::QueryKind;
-use crate::sources::{IndexSummary, PathSource};
+use crate::sources::{IndexSummary, PathSource, RecursivePathSource};
 use crate::util::edit_distance::{closest, edit_distance};
 use crate::util::errors::CargoResult;
 use crate::util::{GlobalContext, OptVersionReq, VersionExt};
@@ -420,7 +420,7 @@ pub(super) fn activation_error(
 
                     let _ = writeln!(
                         &mut msg,
-                        "required by {}",
+                        "note: required by {}",
                         describe_path_in_context(resolver_ctx, &parent.package_id()),
                     );
 
@@ -434,6 +434,41 @@ pub(super) fn activation_error(
                     let _ = writeln!(&mut msg, "no package name is provided");
                 }
             }
+
+            let requested = dep.package_name().as_str();
+            let recursive_package = inspect_recursive_packages(
+                &mut msg,
+                Path::new(&path),
+                global_context,
+                sid,
+                requested,
+            );
+
+            match recursive_package {
+                Some(name) => {
+                    let _ = writeln!(
+                        &mut msg,
+                        "no matching package named `{}` found at `{}`",
+                        name.name,
+                        dep.package_name()
+                    );
+
+                    let _ = writeln!(
+                        &mut msg,
+                        "note: required by {}",
+                        describe_path_in_context(resolver_ctx, &parent.package_id()),
+                    );
+
+                    let _ = writeln!(
+                        &mut msg,
+                        "help: package `{}` exists at `{}`",
+                        name.name, name.name
+                    );
+                }
+                None => {
+                    let _ = writeln!(&mut msg, "no recursive package name is found");
+                }
+            }
         } else {
             let _ = writeln!(
                 &mut msg,
@@ -650,3 +685,50 @@ fn inspect_root_package(
 
     Some(package_info)
 }
+
+#[derive(Debug)]
+struct RecursivePackageInfo {
+    name: String,
+    path: PathBuf,
+}
+
+fn inspect_recursive_packages(
+    msg: &mut String,
+    path: &Path,
+    gctx: &GlobalContext,
+    sid: SourceId,
+    requested: &str,
+) -> Option<RecursivePackageInfo> {
+    let mut rps = RecursivePathSource::new(path, sid, gctx);
+
+    if let Err(e) = rps.load() {
+        msg.push_str(&e.to_string());
+        msg.push('\n');
+    }
+
+    let pkgs = rps
+        .read_packages()
+        .expect("failed to read the packages recursively");
+
+    for pkg in pkgs {
+        if pkg.name() == requested {
+            let manifest = pkg.manifest_path();
+            let pkg_dir = manifest
+                .parent()
+                .expect("failed to take the parent path")
+                .to_path_buf();
+
+            let package_info = RecursivePackageInfo {
+                name: pkg.name().to_string(),
+                path: pkg_dir,
+            };
+
+            return Some(package_info);
+            // } else {
+            //     let list = rps.list_files(&pkg).unwrap();
+            //     println!("{:?}", list);
+        }
+    }
+
+    None
+}

tests/testsuite/build.rs

@@ -1278,8 +1278,9 @@ fn cargo_compile_with_dep_name_mismatch() {
         .with_status(101)
         .with_stderr_data(str![[r#"
 [ERROR] no matching package named `bar` found at `notquitebar`
-required by package `foo v0.0.1 ([ROOT]/foo)`
+[NOTE] required by package `foo v0.0.1 ([ROOT]/foo)`
 [HELP] package `bar` exists at `bar`
+no recursive package name is found
 location searched: [ROOT]/foo/bar
 required by package `foo v0.0.1 ([ROOT]/foo)`
 

tests/testsuite/path.rs

@@ -1956,11 +1956,59 @@ fn invalid_package_name_in_path() {
         .with_status(101)
         .with_stderr_data(str![[r#"
 [ERROR] no matching package named `bar` found at `definitely_not_bar`
-required by package `foo v0.5.0 ([ROOT]/foo)`
+[NOTE] required by package `foo v0.5.0 ([ROOT]/foo)`
 [HELP] package `bar` exists at `bar`
+no recursive package name is found
 location searched: [ROOT]/foo/crates/bar
 required by package `foo v0.5.0 ([ROOT]/foo)`
 
 "#]])
         .run();
 }
+
+#[cargo_test]
+fn invalid_package_in_subdirectory() {
+    let p = project()
+        .file(
+            "Cargo.toml",
+            r#"
+            [package]
+            name = "foo"
+            version = "0.5.0"
+            edition = "2015"
+            authors = []
+
+            [workspace]
+
+            [dependencies]
+            definitely_not_bar = { path = "crates/bar" }
+        "#,
+        )
+        .file("src/lib.rs", "")
+        .file(
+            "crates/bar/definitely_not_bar/Cargo.toml",
+            r#"
+            [package]
+            name = "definitely_not_bar"
+            version = "0.5.0"
+            edition = "2015"
+            authors = []
+            "#,
+        )
+        .file("crates/bar/definitely_not_bar/src/lib.rs", "")
+        .build();
+
+    p.cargo("generate-lockfile")
+        .with_status(101)
+        .with_stderr_data(str![[r#"
+[ERROR] failed to load manifest for dependency `definitely_not_bar`
+
+Caused by:
+  failed to read `[ROOT]/foo/crates/bar/Cargo.toml`
+
+Caused by:
+  [NOT_FOUND]
+
+"#]])
+        .run();
+}