Skip to content

Commit 011266e

Browse files
Firestar99Firestar99
committed
bless compiletests
1 parent 1ea1159 commit 011266e

24 files changed

+300
-175
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ LL | | ");
2626
|
2727
= note: this note originates in the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
2828

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>`
3030
--> $DIR/subgroup_cluster_size_0_fail.rs:10:5
3131
|
3232
LL | spirv_std::arch::subgroup_clustered_i_add::<0, _>(value)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ LL | | ");
2626
|
2727
= note: this note originates in the macro `macro_subgroup_op_clustered` (in Nightly builds, run with -Z macro-backtrace for more info)
2828

29-
note: the above error was encountered while instantiating `fn spirv_std::arch::subgroup_clustered_i_add::<5, u32, u32>`
29+
note: the above error was encountered while instantiating `fn subgroup_clustered_i_add::<5, u32, u32>`
3030
--> $DIR/subgroup_cluster_size_non_power_of_two_fail.rs:10:5
3131
|
3232
LL | spirv_std::arch::subgroup_clustered_i_add::<5, _>(value)

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,19 @@ LL | #[repr(u16)]
6060
|
6161
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
6262
= 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
6464

6565
error[E0277]: the trait bound `NoFrom: From<i32>` is not satisfied
6666
--> $DIR/subgroup_composite_enum_err.rs:
6767
|
6868
LL | #[derive(Copy, Clone, Default, ScalarComposite)]
69-
| ^^^^^^^^^^^^^^^ the trait `From<i32>` is not implemented for `NoFrom`
69+
| ^^^^^^^^^^^^^^^ unsatisfied trait bound
7070
|
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+
| ^^^^^^^^^^^^^^^
7176
= note: this error originates in the derive macro `ScalarComposite` (in Nightly builds, run with -Z macro-backtrace for more info)
7277

7378
error[E0277]: the trait bound `i32: From<NoFrom>` is not satisfied
@@ -90,12 +95,19 @@ error[E0277]: the trait bound `WrongFrom: From<i32>` is not satisfied
9095
--> $DIR/subgroup_composite_enum_err.rs:
9196
|
9297
LL | #[derive(Copy, Clone, Default, ScalarComposite)]
93-
| ^^^^^^^^^^^^^^^ the trait `From<i32>` is not implemented for `WrongFrom`
98+
| ^^^^^^^^^^^^^^^ unsatisfied trait bound
99+
|
100+
help: the trait `From<i32>` is not implemented for `WrongFrom`
101+
but trait `From<u32>` is implemented for it
102+
--> $DIR/subgroup_composite_enum_err.rs:
94103
|
95-
= help: the trait `From<i32>` is not implemented for `WrongFrom`
96-
but trait `From<u32>` is implemented for it
104+
LL | impl From<$repr> for $ident {
105+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
106+
...
107+
LL | enum_repr_from!(WrongFrom, u32);
108+
| ------------------------------- in this macro invocation
97109
= help: for that trait implementation, expected `u32`, found `i32`
98-
= note: this error originates in the derive macro `ScalarComposite` (in Nightly builds, run with -Z macro-backtrace for more info)
110+
= note: this error originates in the derive macro `ScalarComposite` which comes from the expansion of the macro `enum_repr_from` (in Nightly builds, run with -Z macro-backtrace for more info)
99111

100112
error[E0277]: the trait bound `i32: From<WrongFrom>` is not satisfied
101113
--> $DIR/subgroup_composite_enum_err.rs:

‎tests/compiletests/ui/dis/issue-1062.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OpLine %5 11 12
44
%6 = OpLoad %7 %8
55
OpLine %5 11 35
66
%9 = OpLoad %7 %10
7-
OpLine %11 1128 4
7+
OpLine %11 1134 4
88
%12 = OpBitwiseAnd %7 %9 %13
99
%14 = OpISub %7 %15 %12
1010
%16 = OpShiftLeftLogical %7 %6 %12

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OpExtension "SPV_KHR_non_semantic_info"
44
OpMemoryModel Logical Simple
55
OpEntryPoint Fragment %2 "main"
66
OpExecutionMode %2 OriginUpperLeft
7-
%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"
7+
%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"
88
%4 = OpString $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs"
99
%5 = OpString "$DIR/panic_builtin_bounds_check.rs"
1010
OpDecorate %6 ArrayStride 4
@@ -42,7 +42,7 @@ OpBranchConditional %28 %30 %31
4242
%30 = OpLabel
4343
OpBranch %29
4444
%31 = OpLabel
45-
OpLine %4 280 4
45+
OpLine %4 276 4
4646
%32 = OpExtInst %7 %1 1 %3 %10 %18
4747
OpNoLine
4848
OpReturn

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OpExtension "SPV_KHR_non_semantic_info"
44
OpMemoryModel Logical Simple
55
OpEntryPoint Fragment %2 "main" %3 %4 %5
66
OpExecutionMode %2 OriginUpperLeft
7-
%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"
7+
%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"
88
%7 = OpString $SYSROOT/lib/rustlib/src/rust/library/core/src/panicking.rs"
99
%8 = OpString "$DIR/panic_sequential_many.rs"
1010
OpName %3 "x"
@@ -37,7 +37,7 @@ OpNoLine
3737
OpSelectionMerge %20 None
3838
OpBranchConditional %19 %21 %22
3939
%21 = OpLabel
40-
OpLine %7 187 4
40+
OpLine %7 192 4
4141
%23 = OpExtInst %12 %1 1 %6
4242
OpNoLine
4343
OpReturn
@@ -51,7 +51,7 @@ OpNoLine
5151
OpSelectionMerge %26 None
5252
OpBranchConditional %25 %27 %28
5353
%27 = OpLabel
54-
OpLine %7 187 4
54+
OpLine %7 192 4
5555
%29 = OpExtInst %12 %1 1 %6
5656
OpNoLine
5757
OpReturn
@@ -65,7 +65,7 @@ OpNoLine
6565
OpSelectionMerge %32 None
6666
OpBranchConditional %31 %33 %34
6767
%33 = OpLabel
68-
OpLine %7 187 4
68+
OpLine %7 192 4
6969
%35 = OpExtInst %12 %1 1 %6
7070
OpNoLine
7171
OpReturn
@@ -79,7 +79,7 @@ OpNoLine
7979
OpSelectionMerge %38 None
8080
OpBranchConditional %37 %39 %40
8181
%39 = OpLabel
82-
OpLine %7 187 4
82+
OpLine %7 192 4
8383
%41 = OpExtInst %12 %1 1 %6
8484
OpNoLine
8585
OpReturn
@@ -93,7 +93,7 @@ OpNoLine
9393
OpSelectionMerge %44 None
9494
OpBranchConditional %43 %45 %46
9595
%45 = OpLabel
96-
OpLine %7 187 4
96+
OpLine %7 192 4
9797
%47 = OpExtInst %12 %1 1 %6
9898
OpNoLine
9999
OpReturn
@@ -107,7 +107,7 @@ OpNoLine
107107
OpSelectionMerge %50 None
108108
OpBranchConditional %49 %51 %52
109109
%51 = OpLabel
110-
OpLine %7 187 4
110+
OpLine %7 192 4
111111
%53 = OpExtInst %12 %1 1 %6
112112
OpNoLine
113113
OpReturn
@@ -121,7 +121,7 @@ OpNoLine
121121
OpSelectionMerge %56 None
122122
OpBranchConditional %55 %57 %58
123123
%57 = OpLabel
124-
OpLine %7 187 4
124+
OpLine %7 192 4
125125
%59 = OpExtInst %12 %1 1 %6
126126
OpNoLine
127127
OpReturn
@@ -135,7 +135,7 @@ OpNoLine
135135
OpSelectionMerge %62 None
136136
OpBranchConditional %61 %63 %64
137137
%63 = OpLabel
138-
OpLine %7 187 4
138+
OpLine %7 192 4
139139
%65 = OpExtInst %12 %1 1 %6
140140
OpNoLine
141141
OpReturn
@@ -149,7 +149,7 @@ OpNoLine
149149
OpSelectionMerge %68 None
150150
OpBranchConditional %67 %69 %70
151151
%69 = OpLabel
152-
OpLine %7 187 4
152+
OpLine %7 192 4
153153
%71 = OpExtInst %12 %1 1 %6
154154
OpNoLine
155155
OpReturn
@@ -163,7 +163,7 @@ OpNoLine
163163
OpSelectionMerge %74 None
164164
OpBranchConditional %73 %75 %76
165165
%75 = OpLabel
166-
OpLine %7 187 4
166+
OpLine %7 192 4
167167
%77 = OpExtInst %12 %1 1 %6
168168
OpNoLine
169169
OpReturn
@@ -177,7 +177,7 @@ OpNoLine
177177
OpSelectionMerge %80 None
178178
OpBranchConditional %79 %81 %82
179179
%81 = OpLabel
180-
OpLine %7 187 4
180+
OpLine %7 192 4
181181
%83 = OpExtInst %12 %1 1 %6
182182
OpNoLine
183183
OpReturn
@@ -191,7 +191,7 @@ OpNoLine
191191
OpSelectionMerge %86 None
192192
OpBranchConditional %85 %87 %88
193193
%87 = OpLabel
194-
OpLine %7 187 4
194+
OpLine %7 192 4
195195
%89 = OpExtInst %12 %1 1 %6
196196
OpNoLine
197197
OpReturn
@@ -205,7 +205,7 @@ OpNoLine
205205
OpSelectionMerge %92 None
206206
OpBranchConditional %91 %93 %94
207207
%93 = OpLabel
208-
OpLine %7 187 4
208+
OpLine %7 192 4
209209
%95 = OpExtInst %12 %1 1 %6
210210
OpNoLine
211211
OpReturn
@@ -219,7 +219,7 @@ OpNoLine
219219
OpSelectionMerge %98 None
220220
OpBranchConditional %97 %99 %100
221221
%99 = OpLabel
222-
OpLine %7 187 4
222+
OpLine %7 192 4
223223
%101 = OpExtInst %12 %1 1 %6
224224
OpNoLine
225225
OpReturn
@@ -233,7 +233,7 @@ OpNoLine
233233
OpSelectionMerge %104 None
234234
OpBranchConditional %103 %105 %106
235235
%105 = OpLabel
236-
OpLine %7 187 4
236+
OpLine %7 192 4
237237
%107 = OpExtInst %12 %1 1 %6
238238
OpNoLine
239239
OpReturn
@@ -247,7 +247,7 @@ OpNoLine
247247
OpSelectionMerge %110 None
248248
OpBranchConditional %109 %111 %112
249249
%111 = OpLabel
250-
OpLine %7 187 4
250+
OpLine %7 192 4
251251
%113 = OpExtInst %12 %1 1 %6
252252
OpNoLine
253253
OpReturn
@@ -261,7 +261,7 @@ OpNoLine
261261
OpSelectionMerge %116 None
262262
OpBranchConditional %115 %117 %118
263263
%117 = OpLabel
264-
OpLine %7 187 4
264+
OpLine %7 192 4
265265
%119 = OpExtInst %12 %1 1 %6
266266
OpNoLine
267267
OpReturn

‎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 1739 8
5+
OpLine %8 1744 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 1739 8
5+
OpLine %8 1744 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 1939 8
7+
OpLine %11 1944 8
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 1939 8
7+
OpLine %11 1944 8
88
OpStore %6 %9
99
OpNoLine
1010
OpReturn

0 commit comments

Comments
 (0)