Rewrite select_package to only use workspace members

src/lib.rs

@@ -73,13 +73,9 @@ impl Project {
         metadata: &'a cargo_metadata::Metadata,
         package_name: &str,
     ) -> Option<&'a cargo_metadata::Package> {
-        let package = metadata.packages.iter().find(|package| package.name == package_name)?;
-
-        // We need to make sure the package we found is actually a project of the workspace.
-        match metadata.workspace_members.contains(&package.id) {
-            false => None,
-            true => Some(package),
-        }
+        metadata.packages.iter().find(|package| {
+            package.name == package_name && metadata.workspace_members.contains(&package.id)
+        })
     }
 
     pub fn from_current_dir_workspace_project(project_name: &str) -> Result<Project, ProjectError> {

tests/option_cmd_workspace_dependency_collision/Cargo.toml

@@ -0,0 +1,6 @@
+[workspace]
+
+members = [
+    "cargo-rdme",
+    "dependent",
+]

tests/option_cmd_workspace_dependency_collision/README-expected.md

@@ -0,0 +1,7 @@
+<!-- cargo-rdme start -->
+
+# Fake cargo-rdme
+
+This is a fake cargo-rdme crate, designed to conflict with the one published on crates.io.
+
+<!-- cargo-rdme end -->

tests/option_cmd_workspace_dependency_collision/README-template.md

@@ -0,0 +1 @@
+<!-- cargo-rdme -->

tests/option_cmd_workspace_dependency_collision/cargo-rdme/Cargo.toml

@@ -0,0 +1,4 @@
+[package]
+name = "cargo-rdme"
+version = "9000.0.0"
+edition = "2021"

tests/option_cmd_workspace_dependency_collision/cargo-rdme/src/lib.rs

@@ -0,0 +1,5 @@
+//! # Fake cargo-rdme
+//!
+//! This is a fake cargo-rdme crate, designed to conflict with the one published on crates.io.
+
+fn foo() {}

tests/option_cmd_workspace_dependency_collision/dependent/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "dependent"
+version = "0.0.1"
+edition = "2021"
+
+
+[dependencies]
+# Depends on a published version of a crate with a lower version than the one 
+# of the same name in this workspace
+cargo-rdme = "1.4.3"

tests/option_cmd_workspace_dependency_collision/dependent/src/lib.rs

@@ -0,0 +1 @@
+fn foo() {}

tests/tests.rs

@@ -377,6 +377,18 @@ fn integration_test_option_cmd_workspace() {
     run_test_with_options(test_name, &option);
 }
 
+#[test]
+fn integration_test_option_cmd_workspace_dependency_collision() {
+    let test_name = "option_cmd_workspace_dependency_collision";
+
+    let option = TestOptions {
+        args: &["--workspace-project", "cargo-rdme", "--readme-path", "README.md"],
+        ..TestOptions::default()
+    };
+
+    run_test_with_options(test_name, &option);
+}
+
 #[test]
 fn integration_test_option_conf_file_intralinks_docs_rs_base_url() {
     run_test("option_conf_file_intralinks_docs_rs_base_url");