Merge branch 'main' into update-toolchain-Nov-02-2025

Author: dvdplm

crates/rustc_codegen_spirv/build.rs

@@ -8,6 +8,7 @@ use std::collections::VecDeque;
 use std::error::Error;
 use std::path::{Path, PathBuf};
 use std::process::{Command, ExitCode};
+use std::string::ToString;
 use std::{env, fs, mem};
 
 /// Current `rust-toolchain.toml` file
@@ -33,15 +34,15 @@ fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> {
     rustc_output("-vV")?
         .lines()
         .find_map(|l| l.strip_prefix("commit-hash: "))
-        .map(|s| s.to_string())
+        .map(ToString::to_string)
         .ok_or_else(|| "`commit-hash` not found in `rustc -vV` output".into())
 }
 
 fn get_required_commit_hash() -> Result<String, Box<dyn Error>> {
     REQUIRED_RUST_TOOLCHAIN
         .lines()
         .find_map(|l| l.strip_prefix("# commit_hash = "))
-        .map(|s| s.to_string())
+        .map(ToString::to_string)
         .ok_or_else(|| "`commit_hash` not found in `rust-toolchain.toml`".into())
 }
 
@@ -72,16 +73,16 @@ fn check_toolchain_version() -> Result<(), Box<dyn Error>> {
             let stripped_toolchain = REQUIRED_RUST_TOOLCHAIN
                 .lines()
                 .filter(|l| !l.trim().is_empty() && !l.starts_with("# "))
-                .map(|l| l.to_string())
+                .map(ToString::to_string)
                 .reduce(|a, b| a + "\n" + &b)
                 .unwrap_or_default();
 
             return Err(format!(
-                r#"error: wrong toolchain detected (found commit hash `{current_hash}`, expected `{required_hash}`).
+                "error: wrong toolchain detected (found commit hash `{current_hash}`, expected `{required_hash}`).
 Make sure your `rust-toolchain.toml` file contains the following:
 -------------
 {stripped_toolchain}
--------------"#
+-------------"
             ).into());
         }
     }

crates/rustc_codegen_spirv/src/attr.rs

@@ -75,6 +75,7 @@ pub enum IntrinsicType {
 pub struct SpecConstant {
     pub id: u32,
     pub default: Option<u32>,
+    pub array_count: Option<u32>,
 }
 
 // NOTE(eddyb) when adding new `#[spirv(...)]` attributes, the tests found inside
@@ -661,6 +662,8 @@ fn parse_spec_constant_attr(
     Ok(SpecConstant {
         id: id.ok_or_else(|| (arg.span(), "expected `spec_constant(id = ...)`".into()))?,
         default,
+        // to be set later
+        array_count: None,
     })
 }