Skip to content

Commit 708abe8

Browse files
schellschell
committed
bless new errors
1 parent 1ae14b9 commit 708abe8

File tree

7 files changed

+80
-80
lines changed

7 files changed

+80
-80
lines changed

‎tests/ui/image/gather_err.stderr‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
error[E0277]: the trait bound `Image<f32, 0, 2, 0, 0, 1, 0, 4>: HasGather` is not satisfied
1+
error[E0277]: the trait bound `Image<f32, 0, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>: HasGather` is not satisfied
22
--> $DIR/gather_err.rs:15:34
33
|
44
15 | let r1: glam::Vec4 = image1d.gather(*sampler, 0.0f32, 0);
5-
| ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 0, 2, 0, 0, 1, 0, 4>`
5+
| ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 0, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>`
66
|
77
= 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>
11-
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::gather`
12-
--> $SPIRV_STD_SRC/image.rs:197:15
8+
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS, Access>
9+
Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS, Access>
10+
Image<SampledType, 4, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS, Access>
11+
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS, Access>::gather`
12+
--> $SPIRV_STD_SRC/image.rs:208:15
1313
|
14-
190 | pub fn gather<F>(
14+
201 | pub fn gather<F>(
1515
| ------ required by a bound in this associated function
1616
...
17-
197 | Self: HasGather,
18-
| ^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::gather`
17+
208 | Self: HasGather,
18+
| ^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS, Access>::gather`
1919

20-
error[E0277]: the trait bound `Image<f32, 2, 2, 0, 0, 1, 0, 4>: HasGather` is not satisfied
20+
error[E0277]: the trait bound `Image<f32, 2, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>: HasGather` is not satisfied
2121
--> $DIR/gather_err.rs:16:34
2222
|
2323
16 | let r2: glam::Vec4 = image3d.gather(*sampler, v3, 0);
24-
| ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 2, 2, 0, 0, 1, 0, 4>`
24+
| ^^^^^^ the trait `HasGather` is not implemented for `Image<f32, 2, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>`
2525
|
2626
= 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>
30-
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::gather`
31-
--> $SPIRV_STD_SRC/image.rs:197:15
27+
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS, Access>
28+
Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS, Access>
29+
Image<SampledType, 4, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS, Access>
30+
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS, Access>::gather`
31+
--> $SPIRV_STD_SRC/image.rs:208:15
3232
|
33-
190 | pub fn gather<F>(
33+
201 | pub fn gather<F>(
3434
| ------ required by a bound in this associated function
3535
...
36-
197 | Self: HasGather,
37-
| ^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::gather`
36+
208 | Self: HasGather,
37+
| ^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#1}::{constant#0}, SAMPLED, FORMAT, COMPONENTS, Access>::gather`
3838

3939
error: aborting due to 2 previous errors
4040

‎tests/ui/image/implicit_not_in_fragment.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error: ImageSampleImplicitLod cannot be used outside a fragment shader
22
|
33
= note: Stack:
4-
<spirv_std::image::Image<f32, 1, 2, 0, 0, 1, 0, 4>>::sample::<f32, glam::f32::vec2::Vec2>
4+
<spirv_std::image::Image<f32, 1, 2, 0, 0, 1, 0, 4, spirv_std::image::params::ImageAccessUnknown>>::sample::<f32, glam::f32::vec2::Vec2>
55
implicit_not_in_fragment::deeper_stack
66
implicit_not_in_fragment::deep_stack
77
implicit_not_in_fragment::main
@@ -10,7 +10,7 @@ error: ImageSampleImplicitLod cannot be used outside a fragment shader
1010
error: ImageSampleImplicitLod cannot be used outside a fragment shader
1111
|
1212
= note: Stack:
13-
<spirv_std::image::Image<f32, 1, 2, 0, 0, 1, 0, 4>>::sample::<f32, glam::f32::vec2::Vec2>
13+
<spirv_std::image::Image<f32, 1, 2, 0, 0, 1, 0, 4, spirv_std::image::params::ImageAccessUnknown>>::sample::<f32, glam::f32::vec2::Vec2>
1414
implicit_not_in_fragment::main
1515
main
1616

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQueryLevels` is not satisfied
1+
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>: HasQueryLevels` is not satisfied
22
--> $DIR/query_levels_err.rs:12:21
33
|
44
12 | *output = image.query_levels();
5-
| ^^^^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
5+
| ^^^^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>`
66
|
77
= 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>
12-
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_levels`
13-
--> $SPIRV_STD_SRC/image.rs:881:15
8+
Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>
9+
Image<SampledType, 1, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>
10+
Image<SampledType, 2, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>
11+
Image<SampledType, 3, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>
12+
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>::query_levels`
13+
--> $SPIRV_STD_SRC/image.rs:901:15
1414
|
15-
879 | pub fn query_levels(&self) -> u32
15+
899 | pub fn query_levels(&self) -> u32
1616
| ------------ required by a bound in this associated function
17-
880 | where
18-
881 | Self: HasQueryLevels,
19-
| ^^^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_levels`
17+
900 | where
18+
901 | Self: HasQueryLevels,
19+
| ^^^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>::query_levels`
2020

2121
error: aborting due to 1 previous error
2222

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQueryLevels` is not satisfied
1+
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>: HasQueryLevels` is not satisfied
22
--> $DIR/query_lod_err.rs:13:21
33
|
44
13 | *output = image.query_lod(*sampler, glam::Vec2::new(0.0, 1.0));
5-
| ^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
5+
| ^^^^^^^^^ the trait `HasQueryLevels` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>`
66
|
77
= 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>
12-
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_lod`
13-
--> $SPIRV_STD_SRC/image.rs:907:15
8+
Image<SampledType, 0, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>
9+
Image<SampledType, 1, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>
10+
Image<SampledType, 2, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>
11+
Image<SampledType, 3, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>
12+
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>::query_lod`
13+
--> $SPIRV_STD_SRC/image.rs:927:15
1414
|
15-
901 | pub fn query_lod(
15+
921 | pub fn query_lod(
1616
| --------- required by a bound in this associated function
1717
...
18-
907 | Self: HasQueryLevels,
19-
| ^^^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_lod`
18+
927 | Self: HasQueryLevels,
19+
| ^^^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>::query_lod`
2020

2121
error: aborting due to 1 previous error
2222

‎tests/ui/image/query/query_size_err.stderr‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
error[E0277]: the trait bound `Image<f32, 1, 2, 0, 0, 1, 0, 4>: HasQuerySize` is not satisfied
1+
error[E0277]: the trait bound `Image<f32, 1, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>: HasQuerySize` is not satisfied
22
--> $DIR/query_size_err.rs:12:21
33
|
44
12 | *output = image.query_size();
5-
| ^^^^^^^^^^ the trait `HasQuerySize` is not implemented for `Image<f32, 1, 2, 0, 0, 1, 0, 4>`
5+
| ^^^^^^^^^^ the trait `HasQuerySize` is not implemented for `Image<f32, 1, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>`
66
|
77
= help: the following other types implement trait `HasQuerySize`:
8-
Image<SampledType, 0, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS>
9-
Image<SampledType, 0, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS>
10-
Image<SampledType, 0, DEPTH, ARRAYED, 1, SAMPLED, FORMAT, COMPONENTS>
11-
Image<SampledType, 1, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS>
12-
Image<SampledType, 1, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS>
13-
Image<SampledType, 1, DEPTH, ARRAYED, 1, SAMPLED, FORMAT, COMPONENTS>
14-
Image<SampledType, 2, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS>
15-
Image<SampledType, 2, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS>
8+
Image<SampledType, 0, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS, Access>
9+
Image<SampledType, 0, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS, Access>
10+
Image<SampledType, 0, DEPTH, ARRAYED, 1, SAMPLED, FORMAT, COMPONENTS, Access>
11+
Image<SampledType, 1, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS, Access>
12+
Image<SampledType, 1, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS, Access>
13+
Image<SampledType, 1, DEPTH, ARRAYED, 1, SAMPLED, FORMAT, COMPONENTS, Access>
14+
Image<SampledType, 2, DEPTH, ARRAYED, 0, 0, FORMAT, COMPONENTS, Access>
15+
Image<SampledType, 2, DEPTH, ARRAYED, 0, 2, FORMAT, COMPONENTS, Access>
1616
and 6 others
17-
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_size`
18-
--> $SPIRV_STD_SRC/image.rs:938:15
17+
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>::query_size`
18+
--> $SPIRV_STD_SRC/image.rs:958:15
1919
|
20-
936 | pub fn query_size<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(&self) -> Size
20+
956 | pub fn query_size<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(&self) -> Size
2121
| ---------- required by a bound in this associated function
22-
937 | where
23-
938 | Self: HasQuerySize,
24-
| ^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS>::query_size`
22+
957 | where
23+
958 | Self: HasQuerySize,
24+
| ^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, MULTISAMPLED, SAMPLED, FORMAT, COMPONENTS, Access>::query_size`
2525

2626
error: aborting due to 1 previous error
2727

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4>: HasQuerySizeLod` is not satisfied
2-
--> $DIR/query_size_lod_err.rs:12:21
3-
|
4-
12 | *output = image.query_size_lod(0);
5-
| ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4>`
6-
|
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>
12-
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#7}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::query_size_lod`
13-
--> $SPIRV_STD_SRC/image.rs:982:15
14-
|
15-
977 | pub fn query_size_lod<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(
16-
| -------------- required by a bound in this associated function
1+
error[E0277]: the trait bound `Image<f32, 4, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>: HasQuerySizeLod` is not satisfied
2+
--> $DIR/query_size_lod_err.rs:12:21
3+
|
4+
12 | *output = image.query_size_lod(0);
5+
| ^^^^^^^^^^^^^^ the trait `HasQuerySizeLod` is not implemented for `Image<f32, 4, 2, 0, 0, 1, 0, 4, ImageAccessUnknown>`
6+
|
7+
= help: the following other types implement trait `HasQuerySizeLod`:
8+
Image<SampledType, 0, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS, Access>
9+
Image<SampledType, 1, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS, Access>
10+
Image<SampledType, 2, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS, Access>
11+
Image<SampledType, 3, DEPTH, ARRAYED, 0, SAMPLED, FORMAT, COMPONENTS, Access>
12+
note: required by a bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#7}::{constant#0}, SAMPLED, FORMAT, COMPONENTS, Access>::query_size_lod`
13+
--> $SPIRV_STD_SRC/image.rs:1004:15
14+
|
15+
999 | pub fn query_size_lod<Size: ImageCoordinate<u32, DIM, ARRAYED> + Default>(
16+
| -------------- required by a bound in this associated function
1717
...
18-
982 | Self: HasQuerySizeLod,
19-
| ^^^^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#7}::{constant#0}, SAMPLED, FORMAT, COMPONENTS>::query_size_lod`
18+
1004 | Self: HasQuerySizeLod,
19+
| ^^^^^^^^^^^^^^^ required by this bound in `Image::<SampledType, DIM, DEPTH, ARRAYED, spirv_std::::image::{impl#7}::{constant#0}, SAMPLED, FORMAT, COMPONENTS, Access>::query_size_lod`
2020

2121
error: aborting due to 1 previous error
2222

‎tests/ui/spirv-attr/bad-deduce-storage-class.stderr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ warning: redundant storage class attribute, storage class is deduced from type
1515
9 | #[spirv(uniform_constant)] warning: &Image!(2D, type=f32),
1616
| ^^^^^^^^^^^^^^^^
1717

18-
error: entry parameter type must be by-reference: `&spirv_std::image::Image<f32, 1, 2, 0, 0, 0, 0, 4>`
18+
error: entry parameter type must be by-reference: `&spirv_std::image::Image<f32, 1, 2, 0, 0, 0, 0, 4, spirv_std::image::ImageAccessUnknown>`
1919
--> $DIR/bad-deduce-storage-class.rs:15:27
2020
|
2121
15 | pub fn issue_585(invalid: Image!(2D, type=f32)) {}

0 commit comments

Comments
 (0)