Skip to content

Commit bc73567

Browse files
LegNeatoFirestar99
LegNeato
authored and
Firestar99
committed
compiletests: bless expected output for nightly-2026-04-01
1 parent f012026 commit bc73567

File tree

8 files changed

+38
-43
lines changed

8 files changed

+38
-43
lines changed

‎tests/compiletests/ui/arch/debug_printf_type_checking.stderr‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,19 +114,14 @@ error[E0277]: the trait bound `{float}: spirv_std::Vector<f32, 2>` is not satisf
114114
LL | debug_printf!("%v2f", 11.0);
115115
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `spirv_std::Vector<f32, 2>` is not implemented for `{float}`
116116
|
117-
= help: the following other types implement trait `spirv_std::Vector<T, N>`:
118-
`BVec2` implements `spirv_std::Vector<bool, 2>`
119-
`BVec3` implements `spirv_std::Vector<bool, 3>`
120-
`BVec4` implements `spirv_std::Vector<bool, 4>`
121-
`DVec2` implements `spirv_std::Vector<f64, 2>`
122-
`DVec3` implements `spirv_std::Vector<f64, 3>`
123-
`DVec4` implements `spirv_std::Vector<f64, 4>`
124-
`IVec2` implements `spirv_std::Vector<i32, 2>`
125-
`IVec3` implements `spirv_std::Vector<i32, 3>`
126-
and 8 others
117+
help: the trait `spirv_std::Vector<f32, 2>` is implemented for `Vec2`
118+
--> $SPIRV_STD_SRC/vector.rs:70:12
119+
::: $SPIRV_STD_SRC/vector.rs:92:1
120+
|
121+
= note: in this macro invocation
127122
note: required by a bound in `spirv_std::debug_printf::assert_is_vector`
128123
--> $SPIRV_STD_SRC/debug_printf.rs:11:0
129-
= note: this error originates in the macro `debug_printf` (in Nightly builds, run with -Z macro-backtrace for more info)
124+
= note: this error originates in the macro `debug_printf` which comes from the expansion of the macro `impl_vector` (in Nightly builds, run with -Z macro-backtrace for more info)
130125

131126
error[E0308]: mismatched types
132127
--> $DIR/debug_printf_type_checking.rs:25:29

‎tests/compiletests/ui/arch/subgroup/subgroup_composite_enum_err.stderr‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ error[E0277]: the trait bound `i32: From<NoFrom>` is not satisfied
5252
LL | #[derive(Copy, Clone, Default, ScalarComposite)]
5353
| ^^^^^^^^^^^^^^^ the trait `From<NoFrom>` is not implemented for `i32`
5454
|
55-
= help: the following other types implement trait `From<T>`:
56-
`i32` implements `From<NoDefault>`
57-
`i32` implements `From<bool>`
58-
`i32` implements `From<i16>`
59-
`i32` implements `From<i8>`
60-
`i32` implements `From<u16>`
61-
`i32` implements `From<u8>`
55+
= help: `i32` implements trait `From<T>`:
56+
From<NoDefault>
57+
From<bool>
58+
From<i16>
59+
From<i8>
60+
From<u16>
61+
From<u8>
6262
= note: required for `NoFrom` to implement `Into<i32>`
6363
= note: this error originates in the derive macro `ScalarComposite` (in Nightly builds, run with -Z macro-backtrace for more info)
6464

@@ -86,24 +86,24 @@ error[E0277]: the trait bound `i32: From<WrongFrom>` is not satisfied
8686
LL | #[derive(Copy, Clone, Default, ScalarComposite)]
8787
| ^^^^^^^^^^^^^^^ the trait `From<WrongFrom>` is not implemented for `i32`
8888
|
89-
= help: the following other types implement trait `From<T>`:
90-
`i32` implements `From<NoDefault>`
91-
`i32` implements `From<bool>`
92-
`i32` implements `From<i16>`
93-
`i32` implements `From<i8>`
94-
`i32` implements `From<u16>`
95-
`i32` implements `From<u8>`
89+
= help: `i32` implements trait `From<T>`:
90+
From<NoDefault>
91+
From<bool>
92+
From<i16>
93+
From<i8>
94+
From<u16>
95+
From<u8>
9696
= note: required for `WrongFrom` to implement `Into<i32>`
9797
= note: this error originates in the derive macro `ScalarComposite` (in Nightly builds, run with -Z macro-backtrace for more info)
9898

99-
error[E0599]: no variant or associated item named `default` found for enum `NoDefault` in the current scope
99+
error[E0599]: no variant, associated function, or constant named `default` found for enum `NoDefault` in the current scope
100100
--> $DIR/subgroup_composite_enum_err.rs:
101101
|
102102
LL | _ => Self::default(),
103-
| ^^^^^^^ variant or associated item not found in `NoDefault`
103+
| ^^^^^^^ variant, associated function, or constant not found in `NoDefault`
104104
...
105105
LL | pub enum NoDefault {
106-
| ------------------ variant or associated item `default` not found for this enum
106+
| ------------------ variant, associated function, or constant `default` not found for this enum
107107
...
108108
LL | enum_repr_from!(NoDefault, i32);
109109
| ------------------------------- in this macro invocation

‎tests/compiletests/ui/dis/ptr_copy.normal.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: cannot memcpy dynamically sized data
2-
--> <$CORE_SRC/ptr/mod.rs>:642:9
2+
--> <$CORE_SRC/ptr/mod.rs>:643:9
33
|
44
LL | crate::intrinsics::copy(src, dst, count)
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
note: used from within `core::ptr::copy::<f32>`
8-
--> <$CORE_SRC/ptr/mod.rs>:627:21
8+
--> <$CORE_SRC/ptr/mod.rs>:628:21
99
|
1010
LL | pub const unsafe fn copy<T>(src: *const T, dst: *mut T, count: usize) {
1111
| ^^^^
@@ -28,7 +28,7 @@ LL | pub fn main(i: f32, o: &mut f32) {
2828
error: cannot cast between pointer types
2929
from `*f32`
3030
to `*struct () { }`
31-
--> <$CORE_SRC/ptr/mod.rs>:630:9
31+
--> <$CORE_SRC/ptr/mod.rs>:631:9
3232
|
3333
LL | / ub_checks::assert_unsafe_precondition!(
3434
LL | | check_language_ub,
@@ -39,7 +39,7 @@ LL | | );
3939
| |_________^
4040
|
4141
note: used from within `core::ptr::copy::<f32>`
42-
--> <$CORE_SRC/ptr/mod.rs>:630:9
42+
--> <$CORE_SRC/ptr/mod.rs>:631:9
4343
|
4444
LL | / ub_checks::assert_unsafe_precondition!(
4545
LL | | check_language_ub,

‎tests/compiletests/ui/dis/ptr_read.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%4 = OpFunctionParameter %5
33
%6 = OpFunctionParameter %5
44
%7 = OpLabel
5-
OpLine %8 1720 8
5+
OpLine %8 1721 8
66
%9 = OpLoad %10 %4
77
OpLine %11 7 13
88
OpStore %6 %9

‎tests/compiletests/ui/dis/ptr_read_method.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
%4 = OpFunctionParameter %5
33
%6 = OpFunctionParameter %5
44
%7 = OpLabel
5-
OpLine %8 1720 8
5+
OpLine %8 1721 8
66
%9 = OpLoad %10 %4
77
OpLine %11 7 13
88
OpStore %6 %9

‎tests/compiletests/ui/dis/ptr_write.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%7 = OpLabel
55
OpLine %8 7 35
66
%9 = OpLoad %10 %4
7-
OpLine %11 1920 40
7+
OpLine %11 1921 40
88
OpStore %6 %9
99
OpNoLine
1010
OpReturn

‎tests/compiletests/ui/dis/ptr_write_method.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%7 = OpLabel
55
OpLine %8 7 37
66
%9 = OpLoad %10 %4
7-
OpLine %11 1920 40
7+
OpLine %11 1921 40
88
OpStore %6 %9
99
OpNoLine
1010
OpReturn

‎tests/compiletests/ui/lang/consts/u32-from-u64-fail.stderr‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ error[E0277]: the trait bound `u32: From<u64>` is not satisfied
44
LL | let value = u32::from(K);
55
| ^^^ the trait `From<u64>` is not implemented for `u32`
66
|
7-
= help: the following other types implement trait `From<T>`:
8-
`u32` implements `From<Ipv4Addr>`
9-
`u32` implements `From<bool>`
10-
`u32` implements `From<char>`
11-
`u32` implements `From<core::ascii::Char>`
12-
`u32` implements `From<u16>`
13-
`u32` implements `From<u8>`
7+
= help: `u32` implements trait `From<T>`:
8+
From<Ipv4Addr>
9+
From<bool>
10+
From<char>
11+
From<core::ascii::Char>
12+
From<u16>
13+
From<u8>
1414

1515
error: aborting due to 1 previous error
1616

0 commit comments

Comments
 (0)