rustup: update to nightly-2024-03-21. Breaks for_range_signed

Author: eddyb

crates/rustc_codegen_spirv/build.rs

@@ -10,9 +10,9 @@ use std::process::{Command, ExitCode};
 /// `cargo publish`. We need to figure out a way to do this properly, but let's hardcode it for now :/
 //const REQUIRED_RUST_TOOLCHAIN: &str = include_str!("../../rust-toolchain.toml");
 const REQUIRED_RUST_TOOLCHAIN: &str = r#"[toolchain]
-channel = "nightly-2024-03-11"
+channel = "nightly-2024-03-21"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 3b1717c052de4a2dbdd3badb0e7a885f40a8ad9e"#;
+# commit_hash = 1388d7a069d872bcfe5e5dd97ef61fa0a586fac0"#;
 
 fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> {
     let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc"));

crates/rustc_codegen_spirv/src/attr.rs

@@ -455,7 +455,7 @@ impl<'tcx> Visitor<'tcx> for CheckSpirvAttrVisitor<'tcx> {
 
     fn visit_stmt(&mut self, stmt: &'tcx hir::Stmt<'tcx>) {
         // When checking statements ignore expressions, they will be checked later.
-        if let hir::StmtKind::Local(l) = stmt.kind {
+        if let hir::StmtKind::Let(l) = stmt.kind {
             self.check_spirv_attributes(l.hir_id, Target::Statement);
         }
         intravisit::walk_stmt(self, stmt);

crates/rustc_codegen_spirv/src/codegen_cx/declare.rs

@@ -330,7 +330,7 @@ impl<'tcx> StaticMethods for CodegenCx<'tcx> {
         )
     }
 
-    fn codegen_static(&self, def_id: DefId, _is_mutable: bool) {
+    fn codegen_static(&self, def_id: DefId) {
         let g = self.get_static(def_id);
 
         let alloc = match self.tcx.eval_static_initializer(def_id) {

crates/rustc_codegen_spirv/src/linker/test.rs

@@ -148,6 +148,10 @@ fn link_with_linker_opts(
                 Default::default(),
                 Default::default(),
                 Default::default(),
+                "spirv-unknown-spv1.0"
+                    .parse::<crate::target::SpirvTarget>()
+                    .unwrap()
+                    .rustc_target(),
                 Default::default(),
                 rustc_interface::util::rustc_version_str().unwrap_or("unknown"),
                 Default::default(),

crates/rustc_codegen_spirv/src/target.rs

@@ -97,7 +97,7 @@ impl SpirvTarget {
     pub fn rustc_target(&self) -> Target {
         Target {
             llvm_target: self.to_string().into(),
-            description: None,
+            metadata: Default::default(),
             pointer_width: 32,
             data_layout: "e-m:e-p:32:32:32-i64:64-n8:16:32:64".into(),
             arch: ARCH.into(),

crates/spirv-builder/src/lib.rs

@@ -752,7 +752,7 @@ fn invoke_rustc(builder: &SpirvBuilder) -> Result<PathBuf, SpirvBuilderError> {
     cargo.arg("--target").arg(
         Path::new(env!("CARGO_MANIFEST_DIR"))
             .join("target-specs")
-            .join(&format!("{}.json", builder.target)),
+            .join(format!("{}.json", builder.target)),
     );
 
     // NOTE(eddyb) see above how this is computed and why it might be missing.

crates/spirv-builder/target-specs/spirv-unknown-opengl4.0.json

@@ -4,7 +4,6 @@
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
-  "description": null,
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
   "dynamic-linking": true,
@@ -14,6 +13,12 @@
   "linker-is-gnu": false,
   "llvm-target": "spirv-unknown-opengl4.0",
   "main-needs-argc-argv": false,
+  "metadata": {
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
+  },
   "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,

crates/spirv-builder/target-specs/spirv-unknown-opengl4.1.json

@@ -4,7 +4,6 @@
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
-  "description": null,
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
   "dynamic-linking": true,
@@ -14,6 +13,12 @@
   "linker-is-gnu": false,
   "llvm-target": "spirv-unknown-opengl4.1",
   "main-needs-argc-argv": false,
+  "metadata": {
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
+  },
   "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,

crates/spirv-builder/target-specs/spirv-unknown-opengl4.2.json

@@ -4,7 +4,6 @@
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
-  "description": null,
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
   "dynamic-linking": true,
@@ -14,6 +13,12 @@
   "linker-is-gnu": false,
   "llvm-target": "spirv-unknown-opengl4.2",
   "main-needs-argc-argv": false,
+  "metadata": {
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
+  },
   "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,

crates/spirv-builder/target-specs/spirv-unknown-opengl4.3.json

@@ -4,7 +4,6 @@
   "crt-objects-fallback": "false",
   "crt-static-allows-dylibs": true,
   "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
-  "description": null,
   "dll-prefix": "",
   "dll-suffix": ".spv.json",
   "dynamic-linking": true,
@@ -14,6 +13,12 @@
   "linker-is-gnu": false,
   "llvm-target": "spirv-unknown-opengl4.3",
   "main-needs-argc-argv": false,
+  "metadata": {
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
+  },
   "os": "unknown",
   "panic-strategy": "abort",
   "simd-types-indirect": false,