remove targets query

Author: bobozaur

Diff for: tools/rust_analyzer/aquery.rs

@@ -103,14 +103,6 @@ pub fn get_crate_specs(
         .args(config_group.map(|s| format!("--config={s}")))
         .arg("--include_aspects")
         .arg("--include_artifacts")
-        // This just makes the `rust-analyzer` integration more resilient,
-        // in particular when being used to auto-discover workspaces.
-        //
-        // Identifying only compatible targets is tricky and, while
-        // that would be ideal, skipping incompatible targets does not
-        // seem like the worst thing since the purpose of `rust-analyzer`
-        // is helpful IDE support, not 100% correct results.
-        .arg("--skip_incompatible_explicit_targets")
         .arg(format!(
             "--aspects={rules_rust_name}//rust:defs.bzl%rust_analyzer_aspect"
         ))

Diff for: tools/rust_analyzer/bin/discover_rust_project.rs

@@ -49,6 +49,7 @@ fn project_discovery() -> anyhow::Result<()> {
     let (buildfile, targets) =
         ra_arg.query_target_details(&bazel, &output_base, &workspace, config_group.as_deref())?;
 
+    let targets = &[targets];
     log::debug!("got buildfile: {buildfile}");
     log::debug!("got targets: {targets:?}");
 
@@ -59,7 +60,7 @@ fn project_discovery() -> anyhow::Result<()> {
         &workspace,
         config_group.as_deref(),
         rules_rust_name,
-        &targets,
+        targets,
     )?;
 
     // Use the generated files to print the rust-project.json.
@@ -70,7 +71,7 @@ fn project_discovery() -> anyhow::Result<()> {
         &execution_root,
         config_group.as_deref(),
         rules_rust_name,
-        &targets,
+        targets,
         buildfile,
     )
 }

Diff for: tools/rust_analyzer/lib.rs

@@ -33,14 +33,6 @@ pub fn generate_crate_info(
         .arg("build")
         .args(config_group.map(|s| format!("--config={s}")))
         .arg("--norun_validations")
-        // This just makes the `rust-analyzer` integration more resilient,
-        // in particular when being used to auto-discover workspaces.
-        //
-        // Identifying only compatible targets is tricky and, while
-        // that would be ideal, skipping incompatible targets does not
-        // seem like the worst thing since the purpose of `rust-analyzer`
-        // is helpful IDE support, not 100% correct results.
-        .arg("--skip_incompatible_explicit_targets")
         .arg(format!(
             "--aspects={rules_rust}//rust:defs.bzl%rust_analyzer_aspect"
         ))

Diff for: tools/rust_analyzer/ra_arg.rs

@@ -22,7 +22,7 @@ impl RustAnalyzerArg {
         output_base: &Utf8Path,
         workspace: &Utf8Path,
         config_group: Option<&str>,
-    ) -> anyhow::Result<(Utf8PathBuf, Vec<String>)> {
+    ) -> anyhow::Result<(Utf8PathBuf, String)> {
         match self {
             Self::Path(file) => {
                 let buildfile = query_buildfile_for_source_file(
@@ -32,12 +32,10 @@ impl RustAnalyzerArg {
                     config_group,
                     &file,
                 )?;
-                query_targets(bazel, output_base, workspace, config_group, &buildfile)
-                    .map(|t| (buildfile, t))
+                buildfile_to_targets(workspace, &buildfile).map(|t| (buildfile, t))
             }
             Self::Buildfile(buildfile) => {
-                query_targets(bazel, output_base, workspace, config_group, &buildfile)
-                    .map(|t| (buildfile, t))
+                buildfile_to_targets(workspace, &buildfile).map(|t| (buildfile, t))
             }
         }
     }
@@ -114,44 +112,18 @@ fn query_buildfile_for_source_file(
     bail!("no buildfile found for {file}");
 }
 
-fn query_targets(
-    bazel: &Utf8Path,
-    output_base: &Utf8Path,
-    workspace: &Utf8Path,
-    config_group: Option<&str>,
-    buildfile: &Utf8Path,
-) -> anyhow::Result<Vec<String>> {
-    log::info!("running bazel query on buildfile: {buildfile}");
+fn buildfile_to_targets(workspace: &Utf8Path, buildfile: &Utf8Path) -> anyhow::Result<String> {
+    log::info!("getting targets for buildfile: {buildfile}");
 
     let parent_dir = buildfile
         .strip_prefix(workspace)
         .with_context(|| format!("{buildfile} not part of workspace"))?
         .parent();
 
     let targets = match parent_dir {
-        Some(p) if !p.as_str().is_empty() => format!("{p}/..."),
+        Some(p) if !p.as_str().is_empty() => format!("//{p}/..."),
         _ => "//...".to_string(),
     };
 
-    let query_output = Command::new(bazel)
-        .current_dir(workspace)
-        .env_remove("BAZELISK_SKIP_WRAPPER")
-        .env_remove("BUILD_WORKING_DIRECTORY")
-        .env_remove("BUILD_WORKSPACE_DIRECTORY")
-        .arg(format!("--output_base={output_base}"))
-        .arg("query")
-        .args(config_group.map(|s| format!("--config={s}")))
-        .arg(format!(
-            "kind(\"rust_(library|binary|proc_macro|test)\", {targets})"
-        ))
-        .output()
-        .with_context(|| format!("failed to run bazel query for buildfile: {buildfile}"))?;
-
-    log::debug!("{}", String::from_utf8_lossy(&query_output.stderr));
-    log::info!("bazel query for buildfile {buildfile} finished");
-
-    let text = String::from_utf8(query_output.stdout)?;
-    let targets = text.lines().map(ToOwned::to_owned).collect();
-
     Ok(targets)
 }