rustup: update to nightly-2024-02-01.

eddyb · LegNeato · commit 2dc6146b1850 · 2024-09-21T08:20:05.000-04:00
diff --git a/crates/rustc_codegen_spirv/build.rs b/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-01-08"
+channel = "nightly-2024-02-01"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 75c68cfd2b9870f2953b62d250bd7d0564a7b56d"#;
+# commit_hash = 11f32b73e0dc9287e305b5b9980d24aecdc8c17f"#;
 
 fn get_rustc_commit_hash() -> Result<String, Box<dyn Error>> {
     let rustc = std::env::var("RUSTC").unwrap_or_else(|_| String::from("rustc"));
diff --git a/crates/rustc_codegen_spirv/src/abi.rs b/crates/rustc_codegen_spirv/src/abi.rs
@@ -975,7 +975,7 @@ fn trans_intrinsic_type<'tcx>(
                         .tcx
                         .dcx()
                         .struct_span_err(span, "#[spirv(matrix)] type fields must all be vectors")
-                        .note(format!("field type is {}", ty.debug(elem_type, cx)))
+                        .with_note(format!("field type is {}", ty.debug(elem_type, cx)))
                         .emit());
                 }
             }
diff --git a/crates/rustc_codegen_spirv/src/attr.rs b/crates/rustc_codegen_spirv/src/attr.rs
@@ -386,7 +386,7 @@ impl CheckSpirvAttrVisitor<'_> {
                                 span,
                                 format!("only one {category} attribute is allowed on a {target}"),
                             )
-                            .span_note(prev_span, format!("previous {category} attribute"))
+                            .with_span_note(prev_span, format!("previous {category} attribute"))
                             .emit();
                     }
                 },
diff --git a/crates/rustc_codegen_spirv/src/builder/spirv_asm.rs b/crates/rustc_codegen_spirv/src/builder/spirv_asm.rs
@@ -306,10 +306,10 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
                 let storage_class = inst.operands[0].unwrap_storage_class();
                 if storage_class != StorageClass::Generic {
                     self.struct_err("TypePointer in asm! requires `Generic` storage class")
-                        .note(format!(
+                        .with_note(format!(
                             "`{storage_class:?}` storage class was specified"
                         ))
-                        .help(format!(
+                        .with_help(format!(
                             "the storage class will be inferred automatically (e.g. to `{storage_class:?}`)"
                         ))
                         .emit();
@@ -362,7 +362,7 @@ impl<'cx, 'tcx> Builder<'cx, 'tcx> {
                     self.struct_err(format!(
                         "using `Op{op:?}` to return from within `asm!` is disallowed"
                     ))
-                    .note(
+                    .with_note(
                         "resuming execution, without falling through the end \
                         of the `asm!` block, is always undefined behavior",
                     )
diff --git a/crates/rustc_codegen_spirv/src/builder_spirv.rs b/crates/rustc_codegen_spirv/src/builder_spirv.rs
@@ -165,7 +165,7 @@ impl SpirvValue {
                 cx.tcx
                     .dcx()
                     .struct_span_err(span, "Can't use type as a value")
-                    .note(format!("Type: *{}", cx.debug_type(id)))
+                    .with_note(format!("Type: *{}", cx.debug_type(id)))
                     .emit();
 
                 id
diff --git a/crates/rustc_codegen_spirv/src/codegen_cx/entry.rs b/crates/rustc_codegen_spirv/src/codegen_cx/entry.rs
@@ -311,20 +311,17 @@ impl<'tcx> CodegenCx<'tcx> {
                     self.tcx
                         .dcx()
                         .struct_span_err(hir_param.span, "storage class mismatch")
-                        .span_label(
+                        .with_span_label(
                             storage_class_attr.span,
                             format!("`{storage_class:?}` specified in attribute"),
                         )
-                        .span_label(
+                        .with_span_label(
                             hir_param.ty_span,
                             format!("`{deduced:?}` deduced from type"),
                         )
-                        .span_help(
-                            storage_class_attr.span,
-                            format!(
-                                "remove storage class attribute to use `{deduced:?}` as storage class"
-                            ),
-                        )
+                        .with_help(format!(
+                            "remove storage class attribute to use `{deduced:?}` as storage class"
+                        ))
                         .emit();
                 }
                 None => (),
diff --git a/crates/rustc_codegen_spirv/src/lib.rs b/crates/rustc_codegen_spirv/src/lib.rs
@@ -16,7 +16,6 @@
 //! [`spirv-tools`]: https://rust-gpu.github.io/rust-gpu/api/spirv_tools
 //! [`spirv-tools-sys`]: https://rust-gpu.github.io/rust-gpu/api/spirv_tools_sys
 #![feature(rustc_private)]
-#![feature(array_methods)]
 #![feature(assert_matches)]
 #![feature(result_flattening)]
 #![feature(lint_reasons)]
diff --git a/crates/rustc_codegen_spirv/src/link.rs b/crates/rustc_codegen_spirv/src/link.rs
@@ -484,7 +484,7 @@ fn add_upstream_native_libraries(
 // (see `compiler/rustc_codegen_ssa/src/back/link.rs`)
 fn relevant_lib(sess: &Session, lib: &NativeLib) -> bool {
     match lib.cfg {
-        Some(ref cfg) => rustc_attr::cfg_matches(cfg, &sess.parse_sess, CRATE_NODE_ID, None),
+        Some(ref cfg) => rustc_attr::cfg_matches(cfg, sess, CRATE_NODE_ID, None),
         None => true,
     }
 }
diff --git a/crates/rustc_codegen_spirv/src/linker/import_export_link.rs b/crates/rustc_codegen_spirv/src/linker/import_export_link.rs
@@ -188,11 +188,11 @@ fn check_tys_equal(
         Err(sess
             .dcx()
             .struct_err(format!("Types mismatch for {name:?}"))
-            .note(format!(
+            .with_note(format!(
                 "import type: {}",
                 format_ty_(&ty_defs, import_type)
             ))
-            .note(format!(
+            .with_note(format!(
                 "export type: {}",
                 format_ty_(&ty_defs, export_type)
             ))
diff --git a/crates/rustc_codegen_spirv/src/linker/mod.rs b/crates/rustc_codegen_spirv/src/linker/mod.rs
@@ -428,8 +428,8 @@ pub fn link(
                     return Err(sess
                         .dcx()
                         .struct_err(format!("{e}"))
-                        .note("while lowering SPIR-V module to SPIR-T (spirt::spv::lower)")
-                        .note(format!("input SPIR-V module {was_saved_msg}"))
+                        .with_note("while lowering SPIR-V module to SPIR-T (spirt::spv::lower)")
+                        .with_note(format!("input SPIR-V module {was_saved_msg}"))
                         .emit());
                 }
             }
@@ -543,7 +543,7 @@ pub fn link(
             if opts.dump_spirt_passes.is_none() {
                 note.help("re-run with `RUSTGPU_CODEGEN_ARGS=\"--dump-spirt-passes=$PWD\"` for more details");
             }
-            note.note("pretty-printed SPIR-T is preferred when reporting Rust-GPU issues")
+            note.with_note("pretty-printed SPIR-T is preferred when reporting Rust-GPU issues")
                 .emit();
         }
 
diff --git a/crates/rustc_codegen_spirv/src/linker/simple_passes.rs b/crates/rustc_codegen_spirv/src/linker/simple_passes.rs
@@ -250,7 +250,7 @@ pub fn check_fragment_insts(sess: &Session, module: &Module) -> Result<()> {
                             "{} cannot be used outside a fragment shader",
                             inst.class.opname
                         ))
-                        .note(note)
+                        .with_note(note)
                         .emit(),
                 );
             }
diff --git a/crates/rustc_codegen_spirv/src/linker/zombies.rs b/crates/rustc_codegen_spirv/src/linker/zombies.rs
@@ -229,7 +229,7 @@ impl<'a> ZombieReporter<'a> {
         // list out all the leaves, but that shouldn't be a huge issue.
         for root_id in super::dce::collect_roots(self.module) {
             if let Some(zombie) = self.zombies.get_zombie_by_id(root_id) {
-                for (_, mut err) in self.build_errors_keyed_by_leaf_id(zombie) {
+                for (_, err) in self.build_errors_keyed_by_leaf_id(zombie) {
                     result = Err(err.emit());
                 }
             }
diff --git a/crates/rustc_codegen_spirv/src/symbols.rs b/crates/rustc_codegen_spirv/src/symbols.rs
@@ -545,7 +545,7 @@ fn parse_attr_int_value(arg: &NestedMetaItem) -> Result<u32, ParseAttrError> {
         Some(&MetaItemLit {
             kind: LitKind::Int(x, LitIntType::Unsuffixed),
             ..
-        }) if x <= u32::MAX as u128 => Ok(x as u32),
+        }) if x <= u32::MAX as u128 => Ok(x.get() as u32),
         _ => Err((arg.span, "attribute value must be integer".to_string())),
     }
 }
@@ -563,7 +563,7 @@ fn parse_local_size_attr(arg: &NestedMetaItem) -> Result<[u32; 3], ParseAttrErro
                     NestedMetaItem::Lit(MetaItemLit {
                         kind: LitKind::Int(x, LitIntType::Unsuffixed),
                         ..
-                    }) if *x <= u32::MAX as u128 => local_size[idx] = *x as u32,
+                    }) if *x <= u32::MAX as u128 => local_size[idx] = x.get() as u32,
                     _ => return Err((lit.span(), "must be a u32 literal".to_string())),
                 }
             }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,7 +1,7 @@
 [toolchain]
-channel = "nightly-2024-01-08"
+channel = "nightly-2024-02-01"
 components = ["rust-src", "rustc-dev", "llvm-tools"]
-# commit_hash = 75c68cfd2b9870f2953b62d250bd7d0564a7b56d
+# commit_hash = 11f32b73e0dc9287e305b5b9980d24aecdc8c17f
 
 # Whenever changing the nightly channel, update the commit hash above, and make
 # sure to change `REQUIRED_TOOLCHAIN` in `crates/rustc_codegen_spirv/build.rs` also.
diff --git a/tests/ui/dis/issue-1062.stderr b/tests/ui/dis/issue-1062.stderr
@@ -4,7 +4,7 @@ OpLine %5 11 12
 %6 = OpLoad  %7  %8
 OpLine %5 11 35
 %9 = OpLoad  %7  %10
-OpLine %11 1145 4
+OpLine %11 1157 4
 %12 = OpBitwiseAnd  %7  %9 %13
 %14 = OpISub  %7  %15 %12
 %16 = OpShiftLeftLogical  %7  %6 %12
diff --git a/tests/ui/dis/ptr_copy.normal.stderr b/tests/ui/dis/ptr_copy.normal.stderr
@@ -1,13 +1,13 @@
 error: cannot memcpy dynamically sized data
-    --> $CORE_SRC/intrinsics.rs:2800:9
+    --> $CORE_SRC/intrinsics.rs:2866:9
      |
-2800 |         copy(src, dst, count)
+2866 |         copy(src, dst, count)
      |         ^^^^^^^^^^^^^^^^^^^^^
      |
 note: used from within `core::intrinsics::copy::<f32>`
-    --> $CORE_SRC/intrinsics.rs:2786:21
+    --> $CORE_SRC/intrinsics.rs:2852:21
      |
-2786 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
+2852 | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
      |                     ^^^^
 note: called by `ptr_copy::copy_via_raw_ptr`
     --> $DIR/ptr_copy.rs:28:18
diff --git a/tests/ui/spirv-attr/bad-deduce-storage-class.stderr b/tests/ui/spirv-attr/bad-deduce-storage-class.stderr
@@ -7,11 +7,7 @@ error: storage class mismatch
   |             |                `UniformConstant` deduced from type
   |             `Uniform` specified in attribute
   |
-help: remove storage class attribute to use `UniformConstant` as storage class
- --> $DIR/bad-deduce-storage-class.rs:8:13
-  |
-8 |     #[spirv(uniform)] error: &Image!(2D, type=f32),
-  |             ^^^^^^^
+  = help: remove storage class attribute to use `UniformConstant` as storage class
 
 warning: redundant storage class attribute, storage class is deduced from type
  --> $DIR/bad-deduce-storage-class.rs:9:13

Original file line number	Diff line number	Diff line change
`@@ -975,7 +975,7 @@ fn trans_intrinsic_type<'tcx>(`
`975`	`975`	`.tcx`
`976`	`976`	`.dcx()`
`977`	`977`	`.struct_span_err(span, "#[spirv(matrix)] type fields must all be vectors")`
`978`		`- .note(format!("field type is {}", ty.debug(elem_type, cx)))`
	`978`	`+ .with_note(format!("field type is {}", ty.debug(elem_type, cx)))`
`979`	`979`	`.emit());`
`980`	`980`	`}`
`981`	`981`	`}`
Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ impl CheckSpirvAttrVisitor<'_> {`
`386`	`386`	`span,`
`387`	`387`	`format!("only one {category} attribute is allowed on a {target}"),`
`388`	`388`	`)`
`389`		`- .span_note(prev_span, format!("previous {category} attribute"))`
	`389`	`+ .with_span_note(prev_span, format!("previous {category} attribute"))`
`390`	`390`	`.emit();`
`391`	`391`	`}`
`392`	`392`	`},`
Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,7 @@ fn add_upstream_native_libraries(`
`484`	`484`	// (see `compiler/rustc_codegen_ssa/src/back/link.rs`)
`485`	`485`	`fn relevant_lib(sess: &Session, lib: &NativeLib) -> bool {`
`486`	`486`	`match lib.cfg {`
`487`		`- Some(ref cfg) => rustc_attr::cfg_matches(cfg, &sess.parse_sess, CRATE_NODE_ID, None),`
	`487`	`+ Some(ref cfg) => rustc_attr::cfg_matches(cfg, sess, CRATE_NODE_ID, None),`
`488`	`488`	`None => true,`
`489`	`489`	`}`
`490`	`490`	`}`
Original file line number	Diff line number	Diff line change
`@@ -428,8 +428,8 @@ pub fn link(`
`428`	`428`	`return Err(sess`
`429`	`429`	`.dcx()`
`430`	`430`	`.struct_err(format!("{e}"))`
`431`		`- .note("while lowering SPIR-V module to SPIR-T (spirt::spv::lower)")`
`432`		`- .note(format!("input SPIR-V module {was_saved_msg}"))`
	`431`	`+ .with_note("while lowering SPIR-V module to SPIR-T (spirt::spv::lower)")`
	`432`	`+ .with_note(format!("input SPIR-V module {was_saved_msg}"))`
`433`	`433`	`.emit());`
`434`	`434`	`}`
`435`	`435`	`}`
`@@ -543,7 +543,7 @@ pub fn link(`
`543`	`543`	`if opts.dump_spirt_passes.is_none() {`
`544`	`544`	note.help("re-run with `RUSTGPU_CODEGEN_ARGS=\"--dump-spirt-passes=$PWD\"` for more details");
`545`	`545`	`}`
`546`		`- note.note("pretty-printed SPIR-T is preferred when reporting Rust-GPU issues")`
	`546`	`+ note.with_note("pretty-printed SPIR-T is preferred when reporting Rust-GPU issues")`
`547`	`547`	`.emit();`
`548`	`548`	`}`
`549`	`549`