Skip to content

Commit 3bf5575

Browse files
committed
Auto merge of rust-lang#89541 - workingjubilee:abbrev-shufvec-t, r=Mark-Simulacrum
Cleanup src/test/ui/{simd,simd-intrinsic} Initial motivation was to simplify a huge macro expansion using a tuple, since we can just use an array in `#[repr(simd)]` now for the same result. But also, several tests were going unnoticed during development of SIMD intrinsics because people kept looking in the wrong directory, and many are basically run-pass vs. build-fail versions of the same tests, so let's keep them close together and simplify their names, so they're easier to sift through.
2 parents 41dfaaa + 2a7b511 commit 3bf5575

File tree

58 files changed

+205
-358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+205
-358
lines changed

src/test/ui/simd-intrinsic/simd-intrinsic-generic-bitmask.rs

Lines changed: 0 additions & 92 deletions
This file was deleted.

src/test/ui/simd/simd-array-trait.stderr renamed to src/test/ui/simd/array-trait.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: unconstrained generic constant
2-
--> $DIR/simd-array-trait.rs:23:23
2+
--> $DIR/array-trait.rs:23:23
33
|
44
LL | pub struct T<S: Simd>([S::Lane; S::SIZE]);
55
| ^^^^^^^^^^^^^^^^^^
File renamed without changes.
File renamed without changes.

src/test/ui/simd-intrinsic/simd-intrinsic-generic-arithmetic.stderr renamed to src/test/ui/simd/intrinsic/generic-arithmetic-2.stderr

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,89 @@
11
error[E0511]: invalid monomorphization of `simd_add` intrinsic: expected SIMD input type, found non-SIMD `i32`
2-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:69:9
2+
--> $DIR/generic-arithmetic-2.rs:69:9
33
|
44
LL | simd_add(0, 0);
55
| ^^^^^^^^^^^^^^
66

77
error[E0511]: invalid monomorphization of `simd_sub` intrinsic: expected SIMD input type, found non-SIMD `i32`
8-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:71:9
8+
--> $DIR/generic-arithmetic-2.rs:71:9
99
|
1010
LL | simd_sub(0, 0);
1111
| ^^^^^^^^^^^^^^
1212

1313
error[E0511]: invalid monomorphization of `simd_mul` intrinsic: expected SIMD input type, found non-SIMD `i32`
14-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:73:9
14+
--> $DIR/generic-arithmetic-2.rs:73:9
1515
|
1616
LL | simd_mul(0, 0);
1717
| ^^^^^^^^^^^^^^
1818

1919
error[E0511]: invalid monomorphization of `simd_div` intrinsic: expected SIMD input type, found non-SIMD `i32`
20-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:75:9
20+
--> $DIR/generic-arithmetic-2.rs:75:9
2121
|
2222
LL | simd_div(0, 0);
2323
| ^^^^^^^^^^^^^^
2424

2525
error[E0511]: invalid monomorphization of `simd_shl` intrinsic: expected SIMD input type, found non-SIMD `i32`
26-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:77:9
26+
--> $DIR/generic-arithmetic-2.rs:77:9
2727
|
2828
LL | simd_shl(0, 0);
2929
| ^^^^^^^^^^^^^^
3030

3131
error[E0511]: invalid monomorphization of `simd_shr` intrinsic: expected SIMD input type, found non-SIMD `i32`
32-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:79:9
32+
--> $DIR/generic-arithmetic-2.rs:79:9
3333
|
3434
LL | simd_shr(0, 0);
3535
| ^^^^^^^^^^^^^^
3636

3737
error[E0511]: invalid monomorphization of `simd_and` intrinsic: expected SIMD input type, found non-SIMD `i32`
38-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:81:9
38+
--> $DIR/generic-arithmetic-2.rs:81:9
3939
|
4040
LL | simd_and(0, 0);
4141
| ^^^^^^^^^^^^^^
4242

4343
error[E0511]: invalid monomorphization of `simd_or` intrinsic: expected SIMD input type, found non-SIMD `i32`
44-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:83:9
44+
--> $DIR/generic-arithmetic-2.rs:83:9
4545
|
4646
LL | simd_or(0, 0);
4747
| ^^^^^^^^^^^^^
4848

4949
error[E0511]: invalid monomorphization of `simd_xor` intrinsic: expected SIMD input type, found non-SIMD `i32`
50-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:85:9
50+
--> $DIR/generic-arithmetic-2.rs:85:9
5151
|
5252
LL | simd_xor(0, 0);
5353
| ^^^^^^^^^^^^^^
5454

5555
error[E0511]: invalid monomorphization of `simd_neg` intrinsic: expected SIMD input type, found non-SIMD `i32`
56-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:88:9
56+
--> $DIR/generic-arithmetic-2.rs:88:9
5757
|
5858
LL | simd_neg(0);
5959
| ^^^^^^^^^^^
6060

6161
error[E0511]: invalid monomorphization of `simd_shl` intrinsic: unsupported operation on `f32x4` with element `f32`
62-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:92:9
62+
--> $DIR/generic-arithmetic-2.rs:92:9
6363
|
6464
LL | simd_shl(z, z);
6565
| ^^^^^^^^^^^^^^
6666

6767
error[E0511]: invalid monomorphization of `simd_shr` intrinsic: unsupported operation on `f32x4` with element `f32`
68-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:94:9
68+
--> $DIR/generic-arithmetic-2.rs:94:9
6969
|
7070
LL | simd_shr(z, z);
7171
| ^^^^^^^^^^^^^^
7272

7373
error[E0511]: invalid monomorphization of `simd_and` intrinsic: unsupported operation on `f32x4` with element `f32`
74-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:96:9
74+
--> $DIR/generic-arithmetic-2.rs:96:9
7575
|
7676
LL | simd_and(z, z);
7777
| ^^^^^^^^^^^^^^
7878

7979
error[E0511]: invalid monomorphization of `simd_or` intrinsic: unsupported operation on `f32x4` with element `f32`
80-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:98:9
80+
--> $DIR/generic-arithmetic-2.rs:98:9
8181
|
8282
LL | simd_or(z, z);
8383
| ^^^^^^^^^^^^^
8484

8585
error[E0511]: invalid monomorphization of `simd_xor` intrinsic: unsupported operation on `f32x4` with element `f32`
86-
--> $DIR/simd-intrinsic-generic-arithmetic.rs:100:9
86+
--> $DIR/generic-arithmetic-2.rs:100:9
8787
|
8888
LL | simd_xor(z, z);
8989
| ^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)