bless compiletests

Firestar99 · LegNeato · commit df16f4b8bb75 · 2026-03-02T23:44:12.000Z
diff --git a/tests/compiletests/ui/arch/subgroup/subgroup_cluster_size_0_fail.stderr b/tests/compiletests/ui/arch/subgroup/subgroup_cluster_size_0_fail.stderr
@@ -26,7 +26,7 @@ LL | | ");
    |
    = note: this note originates in the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-note: the above error was encountered while instantiating `fn spirv_std::arch::subgroup_clustered_i_add::<0, u32, u32>`
+note: the above error was encountered while instantiating `fn subgroup_clustered_i_add::<0, u32, u32>`
   --> $DIR/subgroup_cluster_size_0_fail.rs:10:5
    |
 LL |     spirv_std::arch::subgroup_clustered_i_add::<0, _>(value)
diff --git a/tests/compiletests/ui/arch/subgroup/subgroup_cluster_size_non_power_of_two_fail.stderr b/tests/compiletests/ui/arch/subgroup/subgroup_cluster_size_non_power_of_two_fail.stderr
@@ -26,7 +26,7 @@ LL | | ");
    |
    = note: this note originates in the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-note: the above error was encountered while instantiating `fn spirv_std::arch::subgroup_clustered_i_add::<5, u32, u32>`
+note: the above error was encountered while instantiating `fn subgroup_clustered_i_add::<5, u32, u32>`
   --> $DIR/subgroup_cluster_size_non_power_of_two_fail.rs:10:5
    |
 LL |     spirv_std::arch::subgroup_clustered_i_add::<5, _>(value)
diff --git a/tests/compiletests/ui/arch/subgroup/subgroup_composite_enum_err.stderr b/tests/compiletests/ui/arch/subgroup/subgroup_composite_enum_err.stderr
@@ -60,14 +60,19 @@ LL | #[repr(u16)]
     |
     = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
     = note: for more information, see issue #68585 <https://github.com/rust-lang/rust/issues/68585>
-    = note: `#[deny(conflicting_repr_hints)]` on by default
+    = note: `#[deny(conflicting_repr_hints)]` (part of `#[deny(future_incompatible)]`) on by default
 
 error[E0277]: the trait bound `NoFrom: From<i32>` is not satisfied
    --> $DIR/subgroup_composite_enum_err.rs:
     |
 LL | #[derive(Copy, Clone, Default, ScalarComposite)]
-    |                                ^^^^^^^^^^^^^^^ the trait `From<i32>` is not implemented for `NoFrom`
+    |                                ^^^^^^^^^^^^^^^ unsatisfied trait bound
     |
+help: the trait `From<i32>` is not implemented for `NoFrom`
+   --> $DIR/subgroup_composite_enum_err.rs:
+    |
+LL | pub enum NoFrom {
+    | ^^^^^^^^^^^^^^^
     = note: this error originates in the derive macro `ScalarComposite` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `i32: From<NoFrom>` is not satisfied
@@ -90,7 +95,7 @@ error[E0277]: the trait bound `WrongFrom: From<i32>` is not satisfied
    --> $DIR/subgroup_composite_enum_err.rs:
     |
 LL | #[derive(Copy, Clone, Default, ScalarComposite)]
-    |                                ^^^^^^^^^^^^^^^ the trait `From<i32>` is not implemented for `WrongFrom`
+    |                                ^^^^^^^^^^^^^^^ unsatisfied trait bound
     |
     = help: the trait `From<i32>` is not implemented for `WrongFrom`
            but trait `From<u32>` is implemented for it
diff --git a/tests/compiletests/ui/dis/issue-1062.stderr b/tests/compiletests/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 1128 4
+OpLine %11 1134 4
 %12 = OpBitwiseAnd  %7  %9 %13
 %14 = OpISub  %7  %15 %12
 %16 = OpShiftLeftLogical  %7  %6 %12
diff --git a/tests/compiletests/ui/dis/panic_builtin_bounds_check.stderr b/tests/compiletests/ui/dis/panic_builtin_bounds_check.stderr
@@ -4,7 +4,7 @@ OpExtension "SPV_KHR_non_semantic_info"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %2 "main"
 OpExecutionMode %2 OriginUpperLeft
-%3 = OpString "/n[Rust panicked at $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs:280:5]/n index out of bounds: the len is %u but the index is %u/n      in main()/n"
+%3 = OpString "/n[Rust panicked at $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs:276:5]/n index out of bounds: the len is %u but the index is %u/n      in main()/n"
 %4 = OpString $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs"
 %5 = OpString "$DIR/panic_builtin_bounds_check.rs"
 OpDecorate %6 ArrayStride 4
@@ -42,7 +42,7 @@ OpBranchConditional %28 %30 %31
 %30 = OpLabel
 OpBranch %29
 %31 = OpLabel
-OpLine %4 280 4
+OpLine %4 276 4
 %32 = OpExtInst  %7  %1 1 %3 %10 %18
 OpNoLine
 OpReturn
diff --git a/tests/compiletests/ui/dis/panic_sequential_many.stderr b/tests/compiletests/ui/dis/panic_sequential_many.stderr
@@ -4,7 +4,7 @@ OpExtension "SPV_KHR_non_semantic_info"
 OpMemoryModel Logical Simple
 OpEntryPoint Fragment %2 "main" %3 %4 %5
 OpExecutionMode %2 OriginUpperLeft
-%6 = OpString "/n[Rust panicked at $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs:187:5]/n attempt to divide by zero/n      in main()/n"
+%6 = OpString "/n[Rust panicked at $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs:192:5]/n attempt to divide by zero/n      in main()/n"
 %7 = OpString $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs"
 %8 = OpString "$DIR/panic_sequential_many.rs"
 OpName %3 "x"
@@ -37,7 +37,7 @@ OpNoLine
 OpSelectionMerge %20 None
 OpBranchConditional %19 %21 %22
 %21 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %23 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -51,7 +51,7 @@ OpNoLine
 OpSelectionMerge %26 None
 OpBranchConditional %25 %27 %28
 %27 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %29 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -65,7 +65,7 @@ OpNoLine
 OpSelectionMerge %32 None
 OpBranchConditional %31 %33 %34
 %33 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %35 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -79,7 +79,7 @@ OpNoLine
 OpSelectionMerge %38 None
 OpBranchConditional %37 %39 %40
 %39 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %41 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -93,7 +93,7 @@ OpNoLine
 OpSelectionMerge %44 None
 OpBranchConditional %43 %45 %46
 %45 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %47 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -107,7 +107,7 @@ OpNoLine
 OpSelectionMerge %50 None
 OpBranchConditional %49 %51 %52
 %51 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %53 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -121,7 +121,7 @@ OpNoLine
 OpSelectionMerge %56 None
 OpBranchConditional %55 %57 %58
 %57 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %59 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -135,7 +135,7 @@ OpNoLine
 OpSelectionMerge %62 None
 OpBranchConditional %61 %63 %64
 %63 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %65 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -149,7 +149,7 @@ OpNoLine
 OpSelectionMerge %68 None
 OpBranchConditional %67 %69 %70
 %69 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %71 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -163,7 +163,7 @@ OpNoLine
 OpSelectionMerge %74 None
 OpBranchConditional %73 %75 %76
 %75 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %77 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -177,7 +177,7 @@ OpNoLine
 OpSelectionMerge %80 None
 OpBranchConditional %79 %81 %82
 %81 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %83 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -191,7 +191,7 @@ OpNoLine
 OpSelectionMerge %86 None
 OpBranchConditional %85 %87 %88
 %87 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %89 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -205,7 +205,7 @@ OpNoLine
 OpSelectionMerge %92 None
 OpBranchConditional %91 %93 %94
 %93 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %95 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -219,7 +219,7 @@ OpNoLine
 OpSelectionMerge %98 None
 OpBranchConditional %97 %99 %100
 %99 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %101 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -233,7 +233,7 @@ OpNoLine
 OpSelectionMerge %104 None
 OpBranchConditional %103 %105 %106
 %105 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %107 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -247,7 +247,7 @@ OpNoLine
 OpSelectionMerge %110 None
 OpBranchConditional %109 %111 %112
 %111 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %113 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
@@ -261,7 +261,7 @@ OpNoLine
 OpSelectionMerge %116 None
 OpBranchConditional %115 %117 %118
 %117 = OpLabel
-OpLine %7 187 4
+OpLine %7 192 4
 %119 = OpExtInst  %12  %1 1 %6
 OpNoLine
 OpReturn
diff --git a/tests/compiletests/ui/dis/ptr_read.stderr b/tests/compiletests/ui/dis/ptr_read.stderr
@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %5
 %6 = OpFunctionParameter  %5
 %7 = OpLabel
-OpLine %8 1739 8
+OpLine %8 1744 8
 %9 = OpLoad  %10  %4
 OpLine %11 7 13
 OpStore %6 %9
diff --git a/tests/compiletests/ui/dis/ptr_read_method.stderr b/tests/compiletests/ui/dis/ptr_read_method.stderr
@@ -2,7 +2,7 @@
 %4 = OpFunctionParameter  %5
 %6 = OpFunctionParameter  %5
 %7 = OpLabel
-OpLine %8 1739 8
+OpLine %8 1744 8
 %9 = OpLoad  %10  %4
 OpLine %11 7 13
 OpStore %6 %9
diff --git a/tests/compiletests/ui/dis/ptr_write.stderr b/tests/compiletests/ui/dis/ptr_write.stderr
@@ -4,7 +4,7 @@
 %7 = OpLabel
 OpLine %8 7 35
 %9 = OpLoad  %10  %4
-OpLine %11 1939 8
+OpLine %11 1944 8
 OpStore %6 %9
 OpNoLine
 OpReturn
diff --git a/tests/compiletests/ui/dis/ptr_write_method.stderr b/tests/compiletests/ui/dis/ptr_write_method.stderr
@@ -4,7 +4,7 @@
 %7 = OpLabel
 OpLine %8 7 37
 %9 = OpLoad  %10  %4
-OpLine %11 1939 8
+OpLine %11 1944 8
 OpStore %6 %9
 OpNoLine
 OpReturn
diff --git a/tests/compiletests/ui/lang/asm/block_tracking_fail.stderr b/tests/compiletests/ui/lang/asm/block_tracking_fail.stderr
@@ -1,15 +1,15 @@
-error: `noreturn` requires a terminator at the end
-  --> $DIR/block_tracking_fail.rs:11:15
-   |
-LL |         asm!("", options(noreturn));
-   |               ^
-
 error: trailing terminator `OpUnreachable` requires `options(noreturn)`
   --> $DIR/block_tracking_fail.rs:18:15
    |
 LL |         asm!("OpUnreachable");
    |               ^^^^^^^^^^^^^
 
+error: `noreturn` requires a terminator at the end
+  --> $DIR/block_tracking_fail.rs:11:15
+   |
+LL |         asm!("", options(noreturn));
+   |               ^
+
 error: expected `OpLabel` after terminator `OpKill`
   --> $DIR/block_tracking_fail.rs:26:14
    |
diff --git a/tests/compiletests/ui/lang/asm/issue-1002.stderr b/tests/compiletests/ui/lang/asm/issue-1002.stderr
@@ -6,14 +6,6 @@ LL |         asm!("OpReturn", options(noreturn));
    |
    = note: resuming execution, without falling through the end of the `asm!` block, is always undefined behavior
 
-error: using `OpReturnValue` to return from within `asm!` is disallowed
-  --> $DIR/issue-1002.rs:16:14
-   |
-LL |             "OpReturnValue {x}",
-   |              ^^^^^^^^^^^^^^^^^
-   |
-   = note: resuming execution, without falling through the end of the `asm!` block, is always undefined behavior
-
 error: using `OpReturn` to return from within `asm!` is disallowed
   --> $DIR/issue-1002.rs:26:14
    |
@@ -22,6 +14,14 @@ LL |             "OpReturn",          // close active block
    |
    = note: resuming execution, without falling through the end of the `asm!` block, is always undefined behavior
 
+error: using `OpReturnValue` to return from within `asm!` is disallowed
+  --> $DIR/issue-1002.rs:16:14
+   |
+LL |             "OpReturnValue {x}",
+   |              ^^^^^^^^^^^^^^^^^
+   |
+   = note: resuming execution, without falling through the end of the `asm!` block, is always undefined behavior
+
 error: using `OpReturnValue` to return from within `asm!` is disallowed
   --> $DIR/issue-1002.rs:35:14
    |
diff --git a/tests/compiletests/ui/lang/consts/nested-ref-in-composite.stderr b/tests/compiletests/ui/lang/consts/nested-ref-in-composite.stderr
@@ -1,20 +1,3 @@
-error: constant arrays/structs cannot contain pointers to other constants
-  --> $DIR/nested-ref-in-composite.rs:20:17
-   |
-LL |     *pair_out = pair_deep_load(&(&123, &3.14));
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-note: used from within `nested_ref_in_composite::main_pair`
-  --> $DIR/nested-ref-in-composite.rs:20:17
-   |
-LL |     *pair_out = pair_deep_load(&(&123, &3.14));
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-note: called by `main_pair`
-  --> $DIR/nested-ref-in-composite.rs:19:8
-   |
-LL | pub fn main_pair(pair_out: &mut (u32, f32)) {
-   |        ^^^^^^^^^
-
 error: constant arrays/structs cannot contain pointers to other constants
   --> $DIR/nested-ref-in-composite.rs:25:19
    |
@@ -32,5 +15,22 @@ note: called by `main_array3`
 LL | pub fn main_array3(array3_out: &mut [u32; 3]) {
    |        ^^^^^^^^^^^
 
+error: constant arrays/structs cannot contain pointers to other constants
+  --> $DIR/nested-ref-in-composite.rs:20:17
+   |
+LL |     *pair_out = pair_deep_load(&(&123, &3.14));
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+note: used from within `nested_ref_in_composite::main_pair`
+  --> $DIR/nested-ref-in-composite.rs:20:17
+   |
+LL |     *pair_out = pair_deep_load(&(&123, &3.14));
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+note: called by `main_pair`
+  --> $DIR/nested-ref-in-composite.rs:19:8
+   |
+LL | pub fn main_pair(pair_out: &mut (u32, f32)) {
+   |        ^^^^^^^^^
+
 error: aborting due to 2 previous errors
 
diff --git a/tests/compiletests/ui/lang/core/intrinsics/black_box.stderr b/tests/compiletests/ui/lang/core/intrinsics/black_box.stderr
@@ -8,7 +8,7 @@ OpLine %5 41 19
 %10 = OpIAdd  %7  %11 %12
 OpLine %5 47 8
 %13 = OpBitcast  %7  %14
-OpLine %15 1092 17
+OpLine %15 1103 17
 %16 = OpBitcast  %7  %17
 OpLine %5 46 4
 %18 = OpCompositeConstruct  %2  %13 %16 %19 %20 %21 %22 %6 %23 %10 %24 %24 %24
diff --git a/tests/compiletests/ui/lang/core/unwrap_or.stderr b/tests/compiletests/ui/lang/core/unwrap_or.stderr
@@ -1,8 +1,8 @@
 %1 = OpFunction  %2  None %3
 %4 = OpLabel
-OpLine %5 1035 14
+OpLine %5 1041 14
 %6 = OpBitcast  %7  %8
-OpLine %5 1035 8
+OpLine %5 1041 8
 %9 = OpINotEqual  %10  %6 %11
 OpNoLine
 OpSelectionMerge %12 None
diff --git a/tests/compiletests/ui/lang/issue-452.stderr b/tests/compiletests/ui/lang/issue-452.stderr
diff --git a/tests/compiletests/ui/lang/panic/track_caller.stderr b/tests/compiletests/ui/lang/panic/track_caller.stderr
diff --git a/tests/compiletests/ui/spirv-attr/invalid-target.stderr b/tests/compiletests/ui/spirv-attr/invalid-target.stderr

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ LL \| \| ");`
`26`	`26`	`\|`
`27`	`27`	= note: this note originates in the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
`28`	`28`
`29`		-note: the above error was encountered while instantiating `fn spirv_std::arch::subgroup_clustered_i_add::<0, u32, u32>`
	`29`	+note: the above error was encountered while instantiating `fn subgroup_clustered_i_add::<0, u32, u32>`
`30`	`30`	`--> $DIR/subgroup_cluster_size_0_fail.rs:10:5`
`31`	`31`	`\|`
`32`	`32`	`LL \| spirv_std::arch::subgroup_clustered_i_add::<0, _>(value)`
Original file line number	Diff line number	Diff line change
`@@ -60,14 +60,19 @@ LL \| #[repr(u16)]`
`60`	`60`	`\|`
`61`	`61`	`= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
`62`	`62`	`= note: for more information, see issue #68585 <https://github.com/rust-lang/rust/issues/68585>`
`63`		- = note: `#[deny(conflicting_repr_hints)]` on by default
	`63`	+ = note: `#[deny(conflicting_repr_hints)]` (part of `#[deny(future_incompatible)]`) on by default
`64`	`64`
`65`	`65`	error[E0277]: the trait bound `NoFrom: From<i32>` is not satisfied
`66`	`66`	`--> $DIR/subgroup_composite_enum_err.rs:`
`67`	`67`	`\|`
`68`	`68`	`LL \| #[derive(Copy, Clone, Default, ScalarComposite)]`
`69`		- \| ^^^^^^^^^^^^^^^ the trait `From<i32>` is not implemented for `NoFrom`
	`69`	`+ \| ^^^^^^^^^^^^^^^ unsatisfied trait bound`
`70`	`70`	`\|`
	`71`	+help: the trait `From<i32>` is not implemented for `NoFrom`
	`72`	`+ --> $DIR/subgroup_composite_enum_err.rs:`
	`73`	`+ \|`
	`74`	`+LL \| pub enum NoFrom {`
	`75`	`+ \| ^^^^^^^^^^^^^^^`
`71`	`76`	= note: this error originates in the derive macro `ScalarComposite` (in Nightly builds, run with -Z macro-backtrace for more info)
`72`	`77`
`73`	`78`	error[E0277]: the trait bound `i32: From<NoFrom>` is not satisfied
@@ -90,7 +95,7 @@ error[E0277]: the trait bound `WrongFrom: From<i32>` is not satisfied
`90`	`95`	`--> $DIR/subgroup_composite_enum_err.rs:`
`91`	`96`	`\|`
`92`	`97`	`LL \| #[derive(Copy, Clone, Default, ScalarComposite)]`
`93`		- \| ^^^^^^^^^^^^^^^ the trait `From<i32>` is not implemented for `WrongFrom`
	`98`	`+ \| ^^^^^^^^^^^^^^^ unsatisfied trait bound`
`94`	`99`	`\|`
`95`	`100`	= help: the trait `From<i32>` is not implemented for `WrongFrom`
`96`	`101`	but trait `From<u32>` is implemented for it