Skip to content

Commit 7656e97

Browse files
Firestar99fee1-dead
Firestar99
authored and
fee1-dead
committed
bless compiletests
1 parent faa0cb6 commit 7656e97

File tree

8 files changed

+222
-31
lines changed

8 files changed

+222
-31
lines changed

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,17 @@ error[E0277]: the trait bound `WrongFrom: From<i32>` is not satisfied
9797
LL | #[derive(Copy, Clone, Default, ScalarComposite)]
9898
| ^^^^^^^^^^^^^^^ unsatisfied trait bound
9999
|
100-
= help: the trait `From<i32>` is not implemented for `WrongFrom`
101-
but trait `From<u32>` is implemented for it
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:
103+
|
104+
LL | impl From<$repr> for $ident {
105+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
106+
...
107+
LL | enum_repr_from!(WrongFrom, u32);
108+
| ------------------------------- in this macro invocation
102109
= help: for that trait implementation, expected `u32`, found `i32`
103-
= 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)
104111

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

‎tests/compiletests/ui/image/gather_err.stderr‎

Lines changed: 58 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,35 @@ error[E0277]: the trait bound `Image<f32, 0, 2, 0, 0, 1, 0, 4>: HasGather` is no
44
LL | let r1: glam::Vec4 = image1d.gather(*sampler, 0.0f32, 0);
55
| ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 0, 2, 0, 0, 1, 0, 4>`
66
|
7-
= help: the following other types implement trait `HasGather`:
8-
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
9-
Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
10-
Image<SampledType, 4, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
7+
help: the following other types implement trait `HasGather`
8+
--> $SPIRV_STD_SRC/image.rs:1652:1
9+
|
10+
LL | / impl<
11+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
12+
LL | | const DEPTH: u32,
13+
LL | | const FORMAT: u32,
14+
... |
15+
LL | | COMPONENTS,
16+
LL | | >
17+
| |_____^ `Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
18+
...
19+
LL | / impl<
20+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
21+
LL | | const DEPTH: u32,
22+
LL | | const FORMAT: u32,
23+
... |
24+
LL | | COMPONENTS,
25+
LL | | >
26+
| |_____^ `Image<SampledType, 4, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
27+
...
28+
LL | / impl<
29+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
30+
LL | | const DEPTH: u32,
31+
LL | | const FORMAT: u32,
32+
... |
33+
LL | | COMPONENTS,
34+
LL | | >
35+
| |_____^ `Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
1136
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::gather`
1237
--> $SPIRV_STD_SRC/image.rs:200:15
1338
|
@@ -23,10 +48,35 @@ error[E0277]: the trait bound `Image<f32, 2, 2, 0, 0, 1, 0, 4>: HasGather` is no
2348
LL | let r2: glam::Vec4 = image3d.gather(*sampler, v3, 0);
2449
| ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 2, 2, 0, 0, 1, 0, 4>`
2550
|
26-
= help: the following other types implement trait `HasGather`:
27-
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
28-
Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
29-
Image<SampledType, 4, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
51+
help: the following other types implement trait `HasGather`
52+
--> $SPIRV_STD_SRC/image.rs:1652:1
53+
|
54+
LL | / impl<
55+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
56+
LL | | const DEPTH: u32,
57+
LL | | const FORMAT: u32,
58+
... |
59+
LL | | COMPONENTS,
60+
LL | | >
61+
| |_____^ `Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
62+
...
63+
LL | / impl<
64+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
65+
LL | | const DEPTH: u32,
66+
LL | | const FORMAT: u32,
67+
... |
68+
LL | | COMPONENTS,
69+
LL | | >
70+
| |_____^ `Image<SampledType, 4, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
71+
...
72+
LL | / impl<
73+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
74+
LL | | const DEPTH: u32,
75+
LL | | const FORMAT: u32,
76+
... |
77+
LL | | COMPONENTS,
78+
LL | | >
79+
| |_____^ `Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
3080
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::gather`
3181
--> $SPIRV_STD_SRC/image.rs:200:15
3282
|

‎tests/compiletests/ui/image/query/query_levels_err.stderr‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,44 @@ error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQueryLevels`
44
LL | *output = image.query_levels();
55
| ^^^^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
66
|
7-
= help: the following other types implement trait `HasQueryLevels`:
8-
Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
9-
Image<SampledType, 1, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
10-
Image<SampledType, 2, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
11-
Image<SampledType, 3, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
7+
help: the following other types implement trait `HasQueryLevels`
8+
--> $SPIRV_STD_SRC/image.rs:1718:1
9+
|
10+
LL | / impl<
11+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
12+
LL | | const DEPTH: u32,
13+
LL | | const FORMAT: u32,
14+
... |
15+
LL | | COMPONENTS,
16+
LL | | >
17+
| |_____^ `Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>`
18+
...
19+
LL | / impl<
20+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
21+
LL | | const DEPTH: u32,
22+
LL | | const FORMAT: u32,
23+
... |
24+
LL | | COMPONENTS,
25+
LL | | >
26+
| |_____^ `Image<SampledType, 1, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>`
27+
...
28+
LL | / impl<
29+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
30+
LL | | const DEPTH: u32,
31+
LL | | const FORMAT: u32,
32+
... |
33+
LL | | COMPONENTS,
34+
LL | | >
35+
| |_____^ `Image<SampledType, 2, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>`
36+
...
37+
LL | / impl<
38+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
39+
LL | | const DEPTH: u32,
40+
LL | | const FORMAT: u32,
41+
... |
42+
LL | | COMPONENTS,
43+
LL | | >
44+
| |_____^ `Image<SampledType, 3, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>`
1245
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_levels`
1346
--> $SPIRV_STD_SRC/image.rs:971:15
1447
|

‎tests/compiletests/ui/image/query/query_lod_err.stderr‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,44 @@ error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQueryLevels`
44
LL | *output = image.query_lod(*sampler, glam::Vec2::new(0.0, 1.0));
55
| ^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
66
|
7-
= help: the following other types implement trait `HasQueryLevels`:
8-
Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
9-
Image<SampledType, 1, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
10-
Image<SampledType, 2, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
11-
Image<SampledType, 3, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>
7+
help: the following other types implement trait `HasQueryLevels`
8+
--> $SPIRV_STD_SRC/image.rs:1718:1
9+
|
10+
LL | / impl<
11+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
12+
LL | | const DEPTH: u32,
13+
LL | | const FORMAT: u32,
14+
... |
15+
LL | | COMPONENTS,
16+
LL | | >
17+
| |_____^ `Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>`
18+
...
19+
LL | / impl<
20+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
21+
LL | | const DEPTH: u32,
22+
LL | | const FORMAT: u32,
23+
... |
24+
LL | | COMPONENTS,
25+
LL | | >
26+
| |_____^ `Image<SampledType, 1, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>`
27+
...
28+
LL | / impl<
29+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
30+
LL | | const DEPTH: u32,
31+
LL | | const FORMAT: u32,
32+
... |
33+
LL | | COMPONENTS,
34+
LL | | >
35+
| |_____^ `Image<SampledType, 2, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>`
36+
...
37+
LL | / impl<
38+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
39+
LL | | const DEPTH: u32,
40+
LL | | const FORMAT: u32,
41+
... |
42+
LL | | COMPONENTS,
43+
LL | | >
44+
| |_____^ `Image<SampledType, 3, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>`
1245
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_lod`
1346
--> $SPIRV_STD_SRC/image.rs:1001:15
1447
|

‎tests/compiletests/ui/image/query/query_size_lod_err.stderr‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,44 @@ error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQuerySizeLod`
44
LL | *output = image.query_size_lod(0);
55
| ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
66
|
7-
= help: the following other types implement trait `HasQuerySizeLod`:
8-
Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
9-
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
10-
Image<SampledType, 2, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
11-
Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
7+
help: the following other types implement trait `HasQuerySizeLod`
8+
--> $SPIRV_STD_SRC/image.rs:2089:1
9+
|
10+
LL | / impl<
11+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
12+
LL | | const DEPTH: u32,
13+
LL | | const FORMAT: u32,
14+
... |
15+
LL | | COMPONENTS,
16+
LL | | >
17+
| |_____^ `Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
18+
...
19+
LL | / impl<
20+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
21+
LL | | const DEPTH: u32,
22+
LL | | const FORMAT: u32,
23+
... |
24+
LL | | COMPONENTS,
25+
LL | | >
26+
| |_____^ `Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
27+
...
28+
LL | / impl<
29+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
30+
LL | | const DEPTH: u32,
31+
LL | | const FORMAT: u32,
32+
... |
33+
LL | | COMPONENTS,
34+
LL | | >
35+
| |_____^ `Image<SampledType, 2, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
36+
...
37+
LL | / impl<
38+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
39+
LL | | const DEPTH: u32,
40+
LL | | const FORMAT: u32,
41+
... |
42+
LL | | COMPONENTS,
43+
LL | | >
44+
| |_____^ `Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
1245
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#7}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::query_size_lod`
1346
--> $SPIRV_STD_SRC/image.rs:1084:15
1447
|

‎tests/compiletests/ui/image/query/sampled_image_rect_query_size_lod_err.stderr‎

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,44 @@ error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQuerySizeLod`
44
LL | *output = rect_sampled.query_size_lod(0);
55
| ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
66
|
7-
= help: the following other types implement trait `HasQuerySizeLod`:
8-
Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
9-
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
10-
Image<SampledType, 2, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
11-
Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>
7+
help: the following other types implement trait `HasQuerySizeLod`
8+
--> /image.rs:2089:1
9+
|
10+
LL | / impl<
11+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
12+
LL | | const DEPTH: u32,
13+
LL | | const FORMAT: u32,
14+
... |
15+
LL | | COMPONENTS,
16+
LL | | >
17+
| |_____^ `Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
18+
...
19+
LL | / impl<
20+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
21+
LL | | const DEPTH: u32,
22+
LL | | const FORMAT: u32,
23+
... |
24+
LL | | COMPONENTS,
25+
LL | | >
26+
| |_____^ `Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
27+
...
28+
LL | / impl<
29+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
30+
LL | | const DEPTH: u32,
31+
LL | | const FORMAT: u32,
32+
... |
33+
LL | | COMPONENTS,
34+
LL | | >
35+
| |_____^ `Image<SampledType, 2, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
36+
...
37+
LL | / impl<
38+
LL | | SampledType: SampleType<FORMAT, COMPONENTS>,
39+
LL | | const DEPTH: u32,
40+
LL | | const FORMAT: u32,
41+
... |
42+
LL | | COMPONENTS,
43+
LL | | >
44+
| |_____^ `Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS>`
1245
note: required by a bound in `SampledImage::<Image<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#9}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>>::query_size_lod`
1346
--> /image.rs:1253:12
1447
|

‎tests/compiletests/ui/lang/core/ref/member_ref_arg-broken.stderr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ LL | fn h_newtyped(xyz: ((&u32, &u32, &u32),)) -> (u32, u32, u32) {
3636

3737
error: error:0:0 - OpLoad Pointer <id> '$ID[%$ID]' is not a logical pointer.
3838
%39 = OpLoad %uint %38
39+
3940
|
4041
= note: spirv-val failed
4142
= note: module `$TEST_BUILD_DIR/lang/core/ref/member_ref_arg-broken`

‎tests/compiletests/ui/spirv-attr/location_assignment/explicit_overlap.stderr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ OpReturn
4343
OpFunctionEnd
4444
error: error:0:0 - [VUID-StandaloneSpirv-OpEntryPoint-08722] Entry-point has conflicting output location assignment at location 1, component 0
4545
OpEntryPoint Vertex %1 "main" %out1 %out2
46+
4647
|
4748
= note: spirv-val failed
4849
= note: module `<normalized>`

0 commit comments

Comments
 (0)