rust_analyzer: Support passing a --config option to Bazel (#3254)

This is useful if you want to analyze code using a different
configuration than the default. An example of this might be under a
different platform.

Author: konkers

tools/rust_analyzer/aquery.rs

@@ -62,13 +62,18 @@ pub struct CrateSpecSource {
 
 pub fn get_crate_specs(
     bazel: &Path,
+    config: &Option<String>,
     workspace: &Path,
     execution_root: &Path,
     targets: &[String],
     rules_rust_name: &str,
 ) -> anyhow::Result<BTreeSet<CrateSpec>> {
     log::debug!("Get crate specs with targets: {:?}", targets);
     let target_pattern = format!("deps({})", targets.join("+"));
+    let config_args = match config {
+        Some(config) => vec!["--config", config],
+        None => Vec::new(),
+    };
 
     let mut aquery_command = Command::new(bazel);
     aquery_command
@@ -77,6 +82,7 @@ pub fn get_crate_specs(
         .env_remove("BUILD_WORKING_DIRECTORY")
         .env_remove("BUILD_WORKSPACE_DIRECTORY")
         .arg("aquery")
+        .args(config_args)
         .arg("--include_aspects")
         .arg("--include_artifacts")
         .arg(format!(

tools/rust_analyzer/lib.rs

@@ -10,18 +10,24 @@ mod rust_project;
 
 pub fn generate_crate_info(
     bazel: impl AsRef<Path>,
+    config: &Option<String>,
     workspace: impl AsRef<Path>,
     rules_rust: impl AsRef<str>,
     targets: &[String],
 ) -> anyhow::Result<()> {
     log::debug!("Building rust_analyzer_crate_spec files for {:?}", targets);
+    let config_args = match config {
+        Some(config) => vec!["--config", config],
+        None => Vec::new(),
+    };
 
     let output = Command::new(bazel.as_ref())
         .current_dir(workspace.as_ref())
         .env_remove("BAZELISK_SKIP_WRAPPER")
         .env_remove("BUILD_WORKING_DIRECTORY")
         .env_remove("BUILD_WORKSPACE_DIRECTORY")
         .arg("build")
+        .args(config_args)
         .arg("--norun_validations")
         .arg("--remote_download_all")
         .arg(format!(
@@ -43,8 +49,10 @@ pub fn generate_crate_info(
     Ok(())
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn write_rust_project(
     bazel: impl AsRef<Path>,
+    config: &Option<String>,
     workspace: impl AsRef<Path>,
     rules_rust_name: &impl AsRef<str>,
     targets: &[String],
@@ -54,6 +62,7 @@ pub fn write_rust_project(
 ) -> anyhow::Result<()> {
     let crate_specs = aquery::get_crate_specs(
         bazel.as_ref(),
+        config,
         workspace.as_ref(),
         execution_root.as_ref(),
         targets,

tools/rust_analyzer/main.rs

@@ -36,6 +36,7 @@ fn main() -> anyhow::Result<()> {
     // Generate the crate specs.
     generate_crate_info(
         &config.bazel,
+        &config.config,
         workspace_root,
         rules_rust_name,
         &config.targets,
@@ -44,6 +45,7 @@ fn main() -> anyhow::Result<()> {
     // Use the generated files to write rust-project.json.
     write_rust_project(
         &config.bazel,
+        &config.config,
         workspace_root,
         &rules_rust_name,
         &config.targets,
@@ -120,6 +122,10 @@ struct Config {
     #[clap(long, env = "OUTPUT_BASE")]
     output_base: Option<PathBuf>,
 
+    /// A config to pass to Bazel invocations with `--config=<config>`.
+    #[clap(long)]
+    config: Option<String>,
+
     /// The path to a Bazel binary
     #[clap(long, default_value = "bazel")]
     bazel: PathBuf,