Rust: Force fixed rust-analyzer compatible toolchain

Author: paldepind

Cargo.lock

@@ -139,6 +139,7 @@ use_repo(
     "vendor_ts__ra_ap_stdx-0.0.347",
     "vendor_ts__ra_ap_syntax-0.0.347",
     "vendor_ts__ra_ap_syntax-bridge-0.0.347",
+    "vendor_ts__ra_ap_toolchain-0.0.347",
     "vendor_ts__ra_ap_vfs-0.0.347",
     "vendor_ts__rand-0.10.2",
     "vendor_ts__rayon-1.12.0",

MODULE.bazel

@@ -21,6 +21,7 @@ ra_ap_paths = "0.0.347"
 ra_ap_project_model = "0.0.347"
 ra_ap_syntax = "0.0.347"
 ra_ap_syntax-bridge = "0.0.347"
+ra_ap_toolchain = "0.0.347"
 ra_ap_vfs = "0.0.347"
 ra_ap_parser = "0.0.347"
 ra_ap_span = "0.0.347"

misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel

@@ -24,6 +24,8 @@ use std::fmt::Debug;
 use std::ops::Not;
 use std::path::{Path, PathBuf};
 
+use crate::toolchain::select_toolchain;
+
 #[derive(Debug, PartialEq, Eq, Default, Serialize, Deserialize, Clone, Copy, clap::ValueEnum)]
 #[serde(rename_all = "lowercase")]
 #[clap(rename_all = "lowercase")]
@@ -140,6 +142,7 @@ impl Config {
             );
         }
         extra_env.extend(self.cargo_extra_env.clone());
+        extra_env.insert("RUSTUP_TOOLCHAIN".to_owned(), Some(select_toolchain()));
         extra_env
     }
 

misc/bazel/3rdparty/tree_sitter_extractors_deps/crates.bzl

@@ -1,5 +1,6 @@
 use crate::diagnostics::{ExtractionStep, emit_extraction_diagnostics};
 use crate::rust_analyzer::{RustAnalyzerNoSemantics, path_to_file_id};
+use crate::toolchain::log_project_toolchain;
 use crate::translate::SourceKind;
 use crate::trap::TrapId;
 use anyhow::Context;
@@ -32,6 +33,7 @@ mod diagnostics;
 pub mod generated;
 mod qltest;
 mod rust_analyzer;
+mod toolchain;
 mod translate;
 pub mod trap;
 
@@ -269,6 +271,7 @@ fn main() -> anyhow::Result<()> {
         );
     }
     let cwd = cwd()?;
+    log_project_toolchain();
     let (cargo_config, load_cargo_config) = cfg.to_cargo_config(&cwd);
     let library_mode = if cfg.extract_dependencies_as_source {
         SourceKind::Source

misc/bazel/3rdparty/tree_sitter_extractors_deps/ra_ap_toolchain-0.0.347/BUILD.bazel

@@ -5,7 +5,6 @@ use itertools::Itertools;
 use std::ffi::OsStr;
 use std::fs;
 use std::path::Path;
-use std::process::Command;
 use tracing::info;
 
 const DEFAULT_EDITION: &str = "2021";
@@ -91,15 +90,8 @@ fn set_sources(config: &mut Config) -> anyhow::Result<()> {
 }
 
 fn cargo_check(config: &Config) -> anyhow::Result<()> {
-    let mut command = Command::new("cargo");
+    let mut command = ra_ap_toolchain::command("cargo", ".", &config.get_extra_env());
     command.env("CARGO_TARGET_DIR", config.cargo_target_dir());
-    // Pass the extra environment variables to the initial `cargo check`.
-    for (key, value) in config.get_extra_env() {
-        match value {
-            Some(value) => command.env(key, value),
-            None => command.env_remove(key),
-        };
-    }
     let status = command
         .arg("check")
         .arg("-q")