Auto merge of #10701 - danilhendrasr:master, r=weihanglo

Emit warning upon encountering multiple packages with the same name Fixes: #10669
rust-lang · May 31, 2022 · 38472bc · 38472bc
2 parents ca4edab + e903f7d
commit 38472bc
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 3 deletions.
diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs
@@ -183,11 +183,11 @@ fn read_nested_packages(
             v.insert(pkg);
         }
         Entry::Occupied(_) => {
-            info!(
-                "skipping nested package `{}` found at `{}`",
+            let _ = config.shell().warn(format!(
+                "skipping duplicate package `{}` found at `{}`",
                 pkg.name(),
                 path.to_string_lossy()
-            );
+            ));
         }
     }
 

diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs
@@ -1023,6 +1023,52 @@ Caused by:
         .run();
 }
 
+#[cargo_test]
+fn dep_ambiguous() {
+    let project = project();
+    let git_project = git::new("dep", |project| {
+        project
+            .file("aaa/Cargo.toml", &basic_manifest("bar", "0.5.0"))
+            .file("aaa/src/lib.rs", "")
+            .file("bbb/Cargo.toml", &basic_manifest("bar", "0.5.0"))
+            .file("bbb/src/lib.rs", "")
+            .file("ccc/Cargo.toml", &basic_manifest("bar", "0.5.0"))
+            .file("ccc/src/lib.rs", "")
+    });
+
+    let p = project
+        .file(
+            "Cargo.toml",
+            &format!(
+                r#"
+                    [project]
+
+                    name = "foo"
+                    version = "0.5.0"
+                    authors = ["wycats@example.com"]
+
+                    [dependencies.bar]
+                    git = '{}'
+                "#,
+                git_project.url()
+            ),
+        )
+        .file("src/main.rs", "fn main() {  }")
+        .build();
+
+    p.cargo("build").run();
+    p.cargo("run")
+        .with_stderr(
+            "\
+[WARNING] skipping duplicate package `bar` found at `[..]`
+[WARNING] skipping duplicate package `bar` found at `[..]`
+[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
+[RUNNING] `target/debug/foo[EXE]`
+",
+        )
+        .run();
+}
+
 #[cargo_test]
 fn two_deps_only_update_one() {
     let project = project();

diff --git a/tests/testsuite/path.rs b/tests/testsuite/path.rs
@@ -870,6 +870,7 @@ fn override_and_depend() {
         .cwd("b")
         .with_stderr(
             "\
+[WARNING] skipping duplicate package `a2` found at `[..]`
 [COMPILING] a2 v0.5.0 ([..])
 [COMPILING] a1 v0.5.0 ([..])
 [COMPILING] b v0.5.0 ([..])