rust-lang#17470 - run unit tests at the crate level not workspace

Author: duncan

crates/flycheck/src/test_runner.rs

@@ -66,12 +66,15 @@ impl CargoTestHandle {
         path: Option<&str>,
         options: CargoOptions,
         root: &AbsPath,
+        is_workspace: bool,
         sender: Sender<CargoTestMessage>,
     ) -> std::io::Result<Self> {
         let mut cmd = Command::new(Tool::Cargo.path());
         cmd.env("RUSTC_BOOTSTRAP", "1");
         cmd.arg("test");
-        cmd.arg("--workspace");
+        if is_workspace {
+            cmd.arg("--workspace");
+        }
         // --no-fail-fast is needed to ensure that all requested tests will run
         cmd.arg("--no-fail-fast");
         cmd.arg("--manifest-path");

crates/rust-analyzer/src/handlers/request.rs

@@ -225,20 +225,34 @@ pub(crate) fn handle_run_test(
             .unwrap_or_default(),
         None => "".to_owned(),
     };
-    let test_path = if lca.is_empty() {
-        None
-    } else if let Some((_, path)) = lca.split_once("::") {
-        Some(path)
+    let (package_name, test_path) = if lca.is_empty() {
+        (None, None)
+    } else if let Some((package_name, path)) = lca.split_once("::") {
+        (Some(package_name), Some(path))
     } else {
-        None
+        (None, None)
     };
     let mut handles = vec![];
     for ws in &*state.workspaces {
         if let ProjectWorkspaceKind::Cargo { cargo, .. } = &ws.kind {
+            // If possible, scope the test to a specific package otherwise run at the workspace level
+            let (is_workspace, test_root) = if let Some(package_name) = package_name {
+                if let Some(package) =
+                    cargo.packages().find(|p| cargo[*p].name.replace('-', "_") == package_name)
+                {
+                    (false, cargo[package].manifest.parent())
+                } else {
+                    (true, cargo.workspace_root())
+                }
+            } else {
+                (true, cargo.workspace_root())
+            };
+
             let handle = flycheck::CargoTestHandle::new(
                 test_path,
                 state.config.cargo_test_options(),
-                cargo.workspace_root(),
+                test_root,
+                is_workspace,
                 state.test_run_sender.clone(),
             )?;
             handles.push(handle);