Merge pull request #8 from djmarcin/rust_analyzer

Make sysroot_src a data dependency

rust/private/rust_analyzer.bzl

@@ -39,10 +39,6 @@ RustAnalyzerInfo = provider(
 )
 
 def _rust_analyzer_aspect_impl(target, ctx):
-    if OutputGroupInfo in target:
-        if "rust_analyzer_sysroot_src" in target[OutputGroupInfo]:
-            return [target[OutputGroupInfo]]
-
     if rust_common.crate_info not in target:
         return []
 
@@ -213,7 +209,7 @@ def _rust_analyzer_detect_sysroot_impl(ctx):
         content = sysroot_src,
     )
 
-    return [OutputGroupInfo(rust_analyzer_sysroot_src = depset([sysroot_src_file]))]
+    return [DefaultInfo(files = depset([sysroot_src_file]))]
 
 rust_analyzer_detect_sysroot = rule(
     implementation = _rust_analyzer_detect_sysroot_impl,

tools/rust_analyzer/BUILD.bazel

@@ -25,8 +25,12 @@ rust_library(
         ["**/*.rs"],
         exclude = ["main.rs"],
     ),
+    data = [
+        "//rust/private:rust_analyzer_detect_sysroot",
+    ],
     edition = "2018",
     deps = [
+        "//tools/runfiles",
         "//tools/rust_analyzer/raze:anyhow",
         "//tools/rust_analyzer/raze:log",
         "//tools/rust_analyzer/raze:serde",

tools/rust_analyzer/aquery.rs

@@ -110,36 +110,6 @@ pub fn get_crate_specs(
     Ok(crate_specs.into_values().collect())
 }
 
-pub fn get_sysroot_src(
-    bazel: &Path,
-    workspace: &Path,
-    execution_root: &Path,
-    rules_rust_name: &str,
-) -> anyhow::Result<String> {
-    let aquery_output = Command::new(bazel)
-        .current_dir(workspace)
-        .arg("aquery")
-        .arg("--include_aspects")
-        .arg(format!(
-            "--aspects={}//rust:defs.bzl%rust_analyzer_aspect",
-            rules_rust_name
-        ))
-        .arg("--output_groups=rust_analyzer_sysroot_src")
-        .arg(format!(
-            r#"outputs(".*[.]rust_analyzer_sysroot_src",{}//rust/private:rust_analyzer_detect_sysroot)"#,
-            rules_rust_name
-        ))
-        .arg("--output=jsonproto")
-        .output()?;
-
-    let sysroot_src_files =
-        parse_aquery_output_files(execution_root, &String::from_utf8(aquery_output.stdout)?)?;
-    log::debug!("sysroot_src_files: {:?}", sysroot_src_files);
-    debug_assert!(sysroot_src_files.len() == 1);
-
-    Ok(std::fs::read_to_string(&sysroot_src_files[0])?)
-}
-
 fn parse_aquery_output_files(
     execution_root: &Path,
     aquery_stdout: &str,

tools/rust_analyzer/lib.rs

@@ -2,11 +2,12 @@ use std::path::Path;
 use std::process::Command;
 
 use anyhow::anyhow;
+use runfiles::Runfiles;
 
 mod aquery;
 mod rust_project;
 
-pub fn generate_crate_and_sysroot_info(
+pub fn generate_crate_info(
     bazel: impl AsRef<Path>,
     workspace: impl AsRef<Path>,
     rules_rust: impl AsRef<str>,
@@ -21,11 +22,7 @@ pub fn generate_crate_and_sysroot_info(
             "--aspects={}//rust:defs.bzl%rust_analyzer_aspect",
             rules_rust.as_ref()
         ))
-        .arg("--output_groups=rust_analyzer_crate_spec,rust_analyzer_sysroot_src")
-        .arg(format!(
-            "{}//rust/private:rust_analyzer_detect_sysroot",
-            rules_rust.as_ref()
-        ))
+        .arg("--output_groups=rust_analyzer_crate_spec")
         .args(targets)
         .output()?;
 
@@ -56,12 +53,17 @@ pub fn write_rust_project(
         rules_rust_name.as_ref(),
     )?;
 
-    let sysroot_src = aquery::get_sysroot_src(
-        bazel.as_ref(),
-        workspace.as_ref(),
-        execution_root.as_ref(),
-        rules_rust_name.as_ref(),
-    )?;
+    let workspace_name = match rules_rust_name.as_ref().trim_start_matches("@") {
+        "" => "rules_rust",
+        s => s,
+    };
+    let sysroot_path = format!(
+        "{}/rust/private/rust_analyzer_detect_sysroot.rust_analyzer_sysroot_src",
+        workspace_name
+    );
+    let r = Runfiles::create()?;
+    let path = r.rlocation(sysroot_path);
+    let sysroot_src = std::fs::read_to_string(&path)?;
 
     let rust_project = rust_project::generate_rust_project(&sysroot_src, &crate_specs)?;
 

tools/rust_analyzer/main.rs

@@ -4,7 +4,7 @@ use std::path::PathBuf;
 use std::process::Command;
 
 use anyhow::anyhow;
-use gen_rust_project_lib::generate_crate_and_sysroot_info;
+use gen_rust_project_lib::generate_crate_info;
 use gen_rust_project_lib::write_rust_project;
 use structopt::StructOpt;
 
@@ -30,8 +30,8 @@ fn main() -> anyhow::Result<()> {
 
     let rules_rust_name = env!("ASPECT_REPOSITORY");
 
-    // Generate the crate specs and sysroot src.
-    generate_crate_and_sysroot_info(&config.bazel, &workspace_root, &rules_rust_name, &targets)?;
+    // Generate the crate specs.
+    generate_crate_info(&config.bazel, &workspace_root, &rules_rust_name, &targets)?;
 
     // Use the generated files to write rust-project.json.
     write_rust_project(