Merge remote-tracking branch 'origin/main' into redsun82-rust-analyzer-update

Author: redsun82

rust/extractor/src/config.rs

@@ -109,14 +109,23 @@ impl Config {
         figment.extract().context("loading configuration")
     }
 
+    fn get_extra_env(&self) -> FxHashMap<String, Option<String>> {
+        let mut extra_env = FxHashMap::default();
+        // RUSTUP_AUTO_INSTALL is set to 0 by rust-analyzer (https://github.com/rust-lang/rust-analyzer/issues/20719),
+        // but we do want to allow rustup to auto-install toolchains if needed, so we set it to 1 here.
+        extra_env.insert("RUSTUP_AUTO_INSTALL".to_owned(), Some("1".to_owned()));
+        extra_env.extend(self.cargo_extra_env.clone());
+        extra_env
+    }
+
     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));
         match (sysroot_input, sysroot_src_input) {
-            (None, None) => Sysroot::discover(dir, &self.cargo_extra_env),
+            (None, None) => Sysroot::discover(dir, &self.get_extra_env()),
             (Some(sysroot), None) => Sysroot::discover_rust_lib_src_dir(sysroot),
             (None, Some(sysroot_src)) => {
-                Sysroot::discover_with_src_override(dir, &self.cargo_extra_env, sysroot_src)
+                Sysroot::discover_with_src_override(dir, &self.get_extra_env(), sysroot_src)
             }
             (Some(sysroot), Some(sysroot_src)) => Sysroot::new(Some(sysroot), Some(sysroot_src)),
         }
@@ -167,7 +176,7 @@ impl Config {
                     .map(ToOwned::to_owned)
                     .map(RustLibSource::Path),
 
-                extra_env: self.cargo_extra_env.clone(),
+                extra_env: self.get_extra_env(),
                 extra_args: self.cargo_extra_args.clone(),
                 extra_includes: self
                     .extra_includes

unified/BUILD.bazel

@@ -41,9 +41,10 @@ codeql_pkg_files(
 
 codeql_pkg_files(
     name = "extractor-arch",
-    exes = [
-        "//unified/extractor",
-    ] + select_os(
+    exes = select_os(
+        posix = ["//unified/extractor"],
+        windows = ["//unified/extractor-unsupported-os:extractor"],
+    ) + select_os(
         linux = ["//unified/swift-syntax-rs:swift_runtime_libs"],
         otherwise = [],
     ),

unified/extractor-unsupported-os/BUILD.bazel

@@ -0,0 +1,8 @@
+load("//misc/bazel:rust.bzl", "codeql_rust_binary")
+
+codeql_rust_binary(
+    name = "extractor",
+    srcs = ["src/main.rs"],
+    crate_root = "src/main.rs",
+    visibility = ["//visibility:public"],
+)

unified/extractor-unsupported-os/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "codeql-extractor-unified-unsupported-os"
+description = "Fallback executable for unsupported CodeQL Unified extractor platforms"
+version = "0.1.0"
+authors = ["GitHub"]
+edition = "2024"

unified/extractor-unsupported-os/src/main.rs

@@ -0,0 +1,4 @@
+fn main() {
+    eprintln!("Unsupported OS. Extraction is not currently supported on Windows.");
+    std::process::exit(1);
+}