From 5fad9dd976eed9d45aef447c6791651d4c303d71 Mon Sep 17 00:00:00 2001 From: Christian Legnitto Date: Mon, 27 Nov 2023 11:59:02 -0400 Subject: [PATCH] Update UI tests --- tests/ui/dis/ptr_read.stderr | 2 +- tests/ui/dis/ptr_read_method.stderr | 2 +- tests/ui/dis/ptr_write.stderr | 2 +- tests/ui/dis/ptr_write_method.stderr | 2 +- tests/ui/image/query/query_levels_err.stderr | 2 +- tests/ui/image/query/query_lod_err.stderr | 2 +- tests/ui/image/query/query_size_err.stderr | 2 +- .../ui/image/query/query_size_lod_err.stderr | 2 +- tests/ui/lang/control_flow/issue_764.stderr | 2 +- .../core/ptr/allocate_const_scalar.stderr | 2 +- .../core/ref/member_ref_arg-broken.stderr | 2 +- tests/ui/lang/core/unwrap_or.stderr | 4 ++-- .../invalid-matrix-type-empty.stderr | 2 +- tests/ui/spirv-attr/invalid-target.stderr | 24 +++++++++---------- tests/ui/spirv-attr/invariant-invalid.stderr | 2 +- .../runtime_descriptor_array_error.stderr | 2 +- tests/ui/target_features_err.stderr | 2 +- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/ui/dis/ptr_read.stderr b/tests/ui/dis/ptr_read.stderr index 722af616d8..c4f70a0853 100644 --- a/tests/ui/dis/ptr_read.stderr +++ b/tests/ui/dis/ptr_read.stderr @@ -2,7 +2,7 @@ %4 = OpFunctionParameter %5 %6 = OpFunctionParameter %5 %7 = OpLabel -OpLine %8 1183 8 +OpLine %8 1200 8 %9 = OpLoad %10 %4 OpLine %11 7 13 OpStore %6 %9 diff --git a/tests/ui/dis/ptr_read_method.stderr b/tests/ui/dis/ptr_read_method.stderr index 722af616d8..c4f70a0853 100644 --- a/tests/ui/dis/ptr_read_method.stderr +++ b/tests/ui/dis/ptr_read_method.stderr @@ -2,7 +2,7 @@ %4 = OpFunctionParameter %5 %6 = OpFunctionParameter %5 %7 = OpLabel -OpLine %8 1183 8 +OpLine %8 1200 8 %9 = OpLoad %10 %4 OpLine %11 7 13 OpStore %6 %9 diff --git a/tests/ui/dis/ptr_write.stderr b/tests/ui/dis/ptr_write.stderr index b86b31d184..f2f9af23c9 100644 --- a/tests/ui/dis/ptr_write.stderr +++ b/tests/ui/dis/ptr_write.stderr @@ -4,7 +4,7 @@ %7 = OpLabel OpLine %8 7 35 %9 = OpLoad %10 %4 -OpLine %11 1382 8 +OpLine %11 1400 8 OpStore %6 %9 OpNoLine OpReturn diff --git a/tests/ui/dis/ptr_write_method.stderr b/tests/ui/dis/ptr_write_method.stderr index 013ba2e906..2141c5964c 100644 --- a/tests/ui/dis/ptr_write_method.stderr +++ b/tests/ui/dis/ptr_write_method.stderr @@ -4,7 +4,7 @@ %7 = OpLabel OpLine %8 7 37 %9 = OpLoad %10 %4 -OpLine %11 1382 8 +OpLine %11 1400 8 OpStore %6 %9 OpNoLine OpReturn diff --git a/tests/ui/image/query/query_levels_err.stderr b/tests/ui/image/query/query_levels_err.stderr index ae524b7ef5..2f03a3f426 100644 --- a/tests/ui/image/query/query_levels_err.stderr +++ b/tests/ui/image/query/query_levels_err.stderr @@ -18,6 +18,6 @@ note: required by a bound in `Image::::query_levels` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/image/query/query_lod_err.stderr b/tests/ui/image/query/query_lod_err.stderr index 5ad3b758fa..0b6a9a052c 100644 --- a/tests/ui/image/query/query_lod_err.stderr +++ b/tests/ui/image/query/query_lod_err.stderr @@ -18,6 +18,6 @@ note: required by a bound in `Image::::query_lod` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/image/query/query_size_err.stderr b/tests/ui/image/query/query_size_err.stderr index 9311a1d78b..b35b9c1298 100644 --- a/tests/ui/image/query/query_size_err.stderr +++ b/tests/ui/image/query/query_size_err.stderr @@ -23,6 +23,6 @@ note: required by a bound in `Image::::query_size` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/image/query/query_size_lod_err.stderr b/tests/ui/image/query/query_size_lod_err.stderr index ed06527761..20464eb29a 100644 --- a/tests/ui/image/query/query_size_lod_err.stderr +++ b/tests/ui/image/query/query_size_lod_err.stderr @@ -18,6 +18,6 @@ note: required by a bound in `Image::::query_size_lod` -error: aborting due to previous error +error: aborting due to 1 previous error For more information about this error, try `rustc --explain E0277`. diff --git a/tests/ui/lang/control_flow/issue_764.stderr b/tests/ui/lang/control_flow/issue_764.stderr index fc05159549..7e5182792d 100644 --- a/tests/ui/lang/control_flow/issue_764.stderr +++ b/tests/ui/lang/control_flow/issue_764.stderr @@ -1,4 +1,4 @@ error: module has recursion, which is not allowed: `<(i32, issue_764::Transform2D) as issue_764::GivesFinalTransform>::get_final_transform` calls `<(i32, issue_764::Transform2D) as issue_764::GivesFinalTransform>::get_final_transform` -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/lang/core/ptr/allocate_const_scalar.stderr b/tests/ui/lang/core/ptr/allocate_const_scalar.stderr index a85b884892..df6374b37b 100644 --- a/tests/ui/lang/core/ptr/allocate_const_scalar.stderr +++ b/tests/ui/lang/core/ptr/allocate_const_scalar.stderr @@ -11,5 +11,5 @@ note: called by `main` 15 | pub fn main(output: &mut Unique<[u8; 4]>) { | ^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/lang/core/ref/member_ref_arg-broken.stderr b/tests/ui/lang/core/ref/member_ref_arg-broken.stderr index 4552ca5cce..1f98421129 100644 --- a/tests/ui/lang/core/ref/member_ref_arg-broken.stderr +++ b/tests/ui/lang/core/ref/member_ref_arg-broken.stderr @@ -7,5 +7,5 @@ error: error:0:0 - OpLoad Pointer '$ID[%$ID]' is not a logical pointer. = note: spirv-val failed = note: module `$TEST_BUILD_DIR/lang/core/ref/member_ref_arg-broken.default` -error: aborting due to previous error; 2 warnings emitted +error: aborting due to 1 previous error; 2 warnings emitted diff --git a/tests/ui/lang/core/unwrap_or.stderr b/tests/ui/lang/core/unwrap_or.stderr index 3b3100c773..8448d926fe 100644 --- a/tests/ui/lang/core/unwrap_or.stderr +++ b/tests/ui/lang/core/unwrap_or.stderr @@ -3,9 +3,9 @@ OpLine %5 13 11 %6 = OpCompositeInsert %7 %8 %9 0 %10 = OpCompositeExtract %11 %6 1 -OpLine %12 956 14 +OpLine %12 952 14 %13 = OpBitcast %14 %8 -OpLine %12 956 8 +OpLine %12 952 8 %15 = OpIEqual %16 %13 %17 OpNoLine OpSelectionMerge %18 None diff --git a/tests/ui/spirv-attr/invalid-matrix-type-empty.stderr b/tests/ui/spirv-attr/invalid-matrix-type-empty.stderr index 6a02d04dd9..d34ef0ac5e 100644 --- a/tests/ui/spirv-attr/invalid-matrix-type-empty.stderr +++ b/tests/ui/spirv-attr/invalid-matrix-type-empty.stderr @@ -4,5 +4,5 @@ error: #[spirv(matrix)] type must have at least two fields 7 | pub struct EmptyStruct {} | ^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/spirv-attr/invalid-target.stderr b/tests/ui/spirv-attr/invalid-target.stderr index d659b95039..0b538de0bb 100644 --- a/tests/ui/spirv-attr/invalid-target.stderr +++ b/tests/ui/spirv-attr/invalid-target.stderr @@ -1679,39 +1679,39 @@ error: attribute is only valid on a function, not on a lifetime parameter | ^^^^^^ error: attribute is only valid on a function parameter, not on a lifetime parameter - --> $DIR/invalid-target.rs:308:9 + --> $DIR/invalid-target.rs:309:9 | -308 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only +309 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only | ^^^^^^^ error: attribute is only valid on a function parameter, not on a lifetime parameter - --> $DIR/invalid-target.rs:308:18 + --> $DIR/invalid-target.rs:309:18 | -308 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only +309 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only | ^^^^^^^^ error: attribute is only valid on a function parameter, not on a lifetime parameter - --> $DIR/invalid-target.rs:308:28 + --> $DIR/invalid-target.rs:309:28 | -308 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only +309 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only | ^^^^^^^^^^^^^^^^^^ error: attribute is only valid on a function parameter, not on a lifetime parameter - --> $DIR/invalid-target.rs:308:48 + --> $DIR/invalid-target.rs:309:48 | -308 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only +309 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only | ^^^^^^^^^^^ error: attribute is only valid on a function parameter, not on a lifetime parameter - --> $DIR/invalid-target.rs:308:61 + --> $DIR/invalid-target.rs:309:61 | -308 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only +309 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only | ^^^^ error: attribute is only valid on a function parameter, not on a lifetime parameter - --> $DIR/invalid-target.rs:308:67 + --> $DIR/invalid-target.rs:309:67 | -308 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only +309 | uniform, position, descriptor_set = 0, binding = 0, flat, invariant, // param-only | ^^^^^^^^^ error: attribute is only valid on a struct, not on a type parameter diff --git a/tests/ui/spirv-attr/invariant-invalid.stderr b/tests/ui/spirv-attr/invariant-invalid.stderr index 4ba05ebacc..8db5f32424 100644 --- a/tests/ui/spirv-attr/invariant-invalid.stderr +++ b/tests/ui/spirv-attr/invariant-invalid.stderr @@ -4,5 +4,5 @@ error: `#[spirv(invariant)]` is only valid on Output variables 7 | pub fn main(#[spirv(invariant)] input: f32) {} | ^^^^^^^^^ -error: aborting due to previous error +error: aborting due to 1 previous error diff --git a/tests/ui/storage_class/runtime_descriptor_array_error.stderr b/tests/ui/storage_class/runtime_descriptor_array_error.stderr index efe0352a43..a6025a5fd0 100644 --- a/tests/ui/storage_class/runtime_descriptor_array_error.stderr +++ b/tests/ui/storage_class/runtime_descriptor_array_error.stderr @@ -10,5 +10,5 @@ warning: use &[T] instead of &RuntimeArray 8 | #[spirv(uniform, descriptor_set = 0, binding = 0)] two: &RuntimeArray, | ^^^^^^^^^^^^^^^^^^ -error: aborting due to previous error; 1 warning emitted +error: aborting due to 1 previous error; 1 warning emitted diff --git a/tests/ui/target_features_err.stderr b/tests/ui/target_features_err.stderr index 8b5b679cb0..9195a361f2 100644 --- a/tests/ui/target_features_err.stderr +++ b/tests/ui/target_features_err.stderr @@ -1,4 +1,4 @@ error: Invalid Capability: `rayTracingKHR` -error: aborting due to previous error +error: aborting due to 1 previous error