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

@@ -23,6 +23,7 @@ use std::collections::HashSet;
 use std::fmt::Debug;
 use std::ops::Not;
 use std::path::{Path, PathBuf};
+use tracing::{info, warn};
 
 #[derive(Debug, PartialEq, Eq, Default, Serialize, Deserialize, Clone, Copy, clap::ValueEnum)]
 #[serde(rename_all = "lowercase")]
@@ -140,9 +141,27 @@ impl Config {
             );
         }
         extra_env.extend(self.cargo_extra_env.clone());
+        extra_env.insert(
+            "RUSTUP_TOOLCHAIN".to_owned(),
+            Some(crate::select_toolchain().to_owned()),
+        );
         extra_env
     }
 
+    pub(crate) fn log_project_toolchain(&self, dir: &AbsPath) {
+        match crate::project_toolchain(dir.as_str()) {
+            Ok(output) if output.status.success() => info!(
+                "project Rust toolchain: {}",
+                String::from_utf8_lossy(&output.stdout).trim()
+            ),
+            Ok(output) => warn!(
+                "unable to determine project Rust toolchain: {}",
+                String::from_utf8_lossy(&output.stderr).trim()
+            ),
+            Err(error) => warn!("unable to determine project Rust toolchain: {error}"),
+        }
+    }
+
     fn sysroot(&self, dir: &AbsPath) -> Sysroot {
         let sysroot_input = self.sysroot.as_ref().map(|p| join_path_buf(dir, p));
         let sysroot_src_input = self.sysroot_src.as_ref().map(|p| join_path_buf(dir, p));
@@ -186,6 +205,7 @@ impl Config {
 
     pub fn to_cargo_config(&self, dir: &AbsPath) -> (CargoConfig, LoadCargoConfig) {
         let sysroot = self.sysroot(dir);
+        info!("Using sysroot: {:?}", sysroot.root());
         (
             CargoConfig {
                 all_targets: self.cargo_all_targets,

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

@@ -15,12 +15,13 @@ use ra_ap_vfs::Vfs;
 use rust_analyzer::{ParseResult, RustAnalyzer};
 use std::collections::HashSet;
 use std::hash::RandomState;
+use std::io;
 use std::time::Instant;
 use std::{
     collections::HashMap,
     path::{Path, PathBuf},
 };
-use std::{env, fs};
+use std::{env, fs, process};
 use tracing::{error, info, warn};
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
@@ -35,6 +36,39 @@ mod rust_analyzer;
 mod translate;
 pub mod trap;
 
+/// The toolchain target by the extractor. When rust-analyzer is updated this
+/// number should be bumped to the last Rust toolchain release that preceedes
+/// the rust-analyzer release.
+const DEFAULT_RUST_TOOLCHAIN: &str = "1.97.0";
+
+/// The command output of asking `rustup` which toolchain is used by the Rust
+/// project in `dir`.
+///
+/// Examples of what the stdout might look like when the command is successful:
+/// - `nightly-aarch64-apple-darwin (overridden by '/path/to/project/rust-toolchain.toml')`
+/// - `stable-aarch64-apple-darwin (default)`
+/// - `1.80.1-aarch64-apple-darwin (overridden by '/path/to/project/rust-toolchain.toml')`
+fn project_toolchain(dir: impl AsRef<Path>) -> io::Result<process::Output> {
+    process::Command::new("rustup")
+        .current_dir(dir)
+        .args(["show", "active-toolchain"])
+        .output()
+}
+
+fn select_toolchain() -> &'static str {
+    let uses_nightly = project_toolchain(".")
+        .ok()
+        .filter(|output| output.status.success())
+        .and_then(|output| String::from_utf8(output.stdout).ok())
+        .is_some_and(|toolchain| toolchain.starts_with("nightly"));
+
+    if uses_nightly {
+        "nightly"
+    } else {
+        DEFAULT_RUST_TOOLCHAIN
+    }
+}
+
 struct Extractor<'a> {
     archiver: &'a Archiver,
     traps: &'a trap::TrapFileProvider,
@@ -269,6 +303,7 @@ fn main() -> anyhow::Result<()> {
         );
     }
     let cwd = cwd()?;
+    cfg.log_project_toolchain(&cwd);
     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")