Skip to content

Commit 5de617e

Browse files
Rename ui test items
1 parent 60dd0df commit 5de617e

File tree

3 files changed

+66
-66
lines changed

3 files changed

+66
-66
lines changed

tests/ui/associated-type-bounds/duplicate-bound-err.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,31 @@
55

66
use std::iter;
77

8-
fn frpit1() -> impl Iterator<Item: Copy, Item: Send> {
8+
fn rpit1() -> impl Iterator<Item: Copy, Item: Send> {
99
iter::empty()
1010
//~^ ERROR type annotations needed
1111
}
12-
fn frpit2() -> impl Iterator<Item: Copy, Item: Copy> {
12+
fn rpit2() -> impl Iterator<Item: Copy, Item: Copy> {
1313
iter::empty()
1414
//~^ ERROR type annotations needed
1515
}
16-
fn frpit3() -> impl Iterator<Item: 'static, Item: 'static> {
16+
fn rpit3() -> impl Iterator<Item: 'static, Item: 'static> {
1717
iter::empty()
1818
//~^ ERROR type annotations needed
1919
}
2020

21-
type ETAI1<T: Iterator<Item: Copy, Item: Send>> = impl Copy;
21+
type Tait1<T: Iterator<Item: Copy, Item: Send>> = impl Copy;
2222
//~^ ERROR unconstrained opaque type
23-
type ETAI2<T: Iterator<Item: Copy, Item: Copy>> = impl Copy;
23+
type Tait2<T: Iterator<Item: Copy, Item: Copy>> = impl Copy;
2424
//~^ ERROR unconstrained opaque type
25-
type ETAI3<T: Iterator<Item: 'static, Item: 'static>> = impl Copy;
25+
type Tait3<T: Iterator<Item: 'static, Item: 'static>> = impl Copy;
2626
//~^ ERROR unconstrained opaque type
2727

28-
type ETAI4 = impl Iterator<Item: Copy, Item: Send>;
28+
type Tait4 = impl Iterator<Item: Copy, Item: Send>;
2929
//~^ ERROR unconstrained opaque type
30-
type ETAI5 = impl Iterator<Item: Copy, Item: Copy>;
30+
type Tait5 = impl Iterator<Item: Copy, Item: Copy>;
3131
//~^ ERROR unconstrained opaque type
32-
type ETAI6 = impl Iterator<Item: 'static, Item: 'static>;
32+
type Tait6 = impl Iterator<Item: 'static, Item: 'static>;
3333
//~^ ERROR unconstrained opaque type
3434

3535
fn mismatch() -> impl Iterator<Item: Copy, Item: Send> {

tests/ui/associated-type-bounds/duplicate-bound-err.stderr

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,50 +34,50 @@ LL | iter::empty::<T>()
3434
error: unconstrained opaque type
3535
--> $DIR/duplicate-bound-err.rs:21:51
3636
|
37-
LL | type ETAI1<T: Iterator<Item: Copy, Item: Send>> = impl Copy;
37+
LL | type Tait1<T: Iterator<Item: Copy, Item: Send>> = impl Copy;
3838
| ^^^^^^^^^
3939
|
40-
= note: `ETAI1` must be used in combination with a concrete type within the same crate
40+
= note: `Tait1` must be used in combination with a concrete type within the same crate
4141

4242
error: unconstrained opaque type
4343
--> $DIR/duplicate-bound-err.rs:23:51
4444
|
45-
LL | type ETAI2<T: Iterator<Item: Copy, Item: Copy>> = impl Copy;
45+
LL | type Tait2<T: Iterator<Item: Copy, Item: Copy>> = impl Copy;
4646
| ^^^^^^^^^
4747
|
48-
= note: `ETAI2` must be used in combination with a concrete type within the same crate
48+
= note: `Tait2` must be used in combination with a concrete type within the same crate
4949

5050
error: unconstrained opaque type
5151
--> $DIR/duplicate-bound-err.rs:25:57
5252
|
53-
LL | type ETAI3<T: Iterator<Item: 'static, Item: 'static>> = impl Copy;
53+
LL | type Tait3<T: Iterator<Item: 'static, Item: 'static>> = impl Copy;
5454
| ^^^^^^^^^
5555
|
56-
= note: `ETAI3` must be used in combination with a concrete type within the same crate
56+
= note: `Tait3` must be used in combination with a concrete type within the same crate
5757

5858
error: unconstrained opaque type
5959
--> $DIR/duplicate-bound-err.rs:28:14
6060
|
61-
LL | type ETAI4 = impl Iterator<Item: Copy, Item: Send>;
61+
LL | type Tait4 = impl Iterator<Item: Copy, Item: Send>;
6262
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6363
|
64-
= note: `ETAI4` must be used in combination with a concrete type within the same crate
64+
= note: `Tait4` must be used in combination with a concrete type within the same crate
6565

6666
error: unconstrained opaque type
6767
--> $DIR/duplicate-bound-err.rs:30:14
6868
|
69-
LL | type ETAI5 = impl Iterator<Item: Copy, Item: Copy>;
69+
LL | type Tait5 = impl Iterator<Item: Copy, Item: Copy>;
7070
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7171
|
72-
= note: `ETAI5` must be used in combination with a concrete type within the same crate
72+
= note: `Tait5` must be used in combination with a concrete type within the same crate
7373

7474
error: unconstrained opaque type
7575
--> $DIR/duplicate-bound-err.rs:32:14
7676
|
77-
LL | type ETAI6 = impl Iterator<Item: 'static, Item: 'static>;
77+
LL | type Tait6 = impl Iterator<Item: 'static, Item: 'static>;
7878
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7979
|
80-
= note: `ETAI6` must be used in combination with a concrete type within the same crate
80+
= note: `Tait6` must be used in combination with a concrete type within the same crate
8181

8282
error[E0277]: `*const ()` cannot be sent between threads safely
8383
--> $DIR/duplicate-bound-err.rs:35:18

tests/ui/associated-type-bounds/duplicate-bound.rs

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,84 +7,84 @@
77
use std::iter;
88
use std::mem::ManuallyDrop;
99

10-
struct SI1<T: Iterator<Item: Copy, Item: Send>> {
10+
struct Si1<T: Iterator<Item: Copy, Item: Send>> {
1111
f: T,
1212
}
13-
struct SI2<T: Iterator<Item: Copy, Item: Copy>> {
13+
struct Si2<T: Iterator<Item: Copy, Item: Copy>> {
1414
f: T,
1515
}
16-
struct SI3<T: Iterator<Item: 'static, Item: 'static>> {
16+
struct Si3<T: Iterator<Item: 'static, Item: 'static>> {
1717
f: T,
1818
}
19-
struct SW1<T>
19+
struct Sw1<T>
2020
where
2121
T: Iterator<Item: Copy, Item: Send>,
2222
{
2323
f: T,
2424
}
25-
struct SW2<T>
25+
struct Sw2<T>
2626
where
2727
T: Iterator<Item: Copy, Item: Copy>,
2828
{
2929
f: T,
3030
}
31-
struct SW3<T>
31+
struct Sw3<T>
3232
where
3333
T: Iterator<Item: 'static, Item: 'static>,
3434
{
3535
f: T,
3636
}
3737

38-
enum EI1<T: Iterator<Item: Copy, Item: Send>> {
38+
enum Ei1<T: Iterator<Item: Copy, Item: Send>> {
3939
V(T),
4040
}
41-
enum EI2<T: Iterator<Item: Copy, Item: Copy>> {
41+
enum Ei2<T: Iterator<Item: Copy, Item: Copy>> {
4242
V(T),
4343
}
44-
enum EI3<T: Iterator<Item: 'static, Item: 'static>> {
44+
enum Ei3<T: Iterator<Item: 'static, Item: 'static>> {
4545
V(T),
4646
}
47-
enum EW1<T>
47+
enum Ew1<T>
4848
where
4949
T: Iterator<Item: Copy, Item: Send>,
5050
{
5151
V(T),
5252
}
53-
enum EW2<T>
53+
enum Ew2<T>
5454
where
5555
T: Iterator<Item: Copy, Item: Copy>,
5656
{
5757
V(T),
5858
}
59-
enum EW3<T>
59+
enum Ew3<T>
6060
where
6161
T: Iterator<Item: 'static, Item: 'static>,
6262
{
6363
V(T),
6464
}
6565

66-
union UI1<T: Iterator<Item: Copy, Item: Send>> {
66+
union Ui1<T: Iterator<Item: Copy, Item: Send>> {
6767
f: ManuallyDrop<T>,
6868
}
69-
union UI2<T: Iterator<Item: Copy, Item: Copy>> {
69+
union Ui2<T: Iterator<Item: Copy, Item: Copy>> {
7070
f: ManuallyDrop<T>,
7171
}
72-
union UI3<T: Iterator<Item: 'static, Item: 'static>> {
72+
union Ui3<T: Iterator<Item: 'static, Item: 'static>> {
7373
f: ManuallyDrop<T>,
7474
}
75-
union UW1<T>
75+
union Uw1<T>
7676
where
7777
T: Iterator<Item: Copy, Item: Send>,
7878
{
7979
f: ManuallyDrop<T>,
8080
}
81-
union UW2<T>
81+
union Uw2<T>
8282
where
8383
T: Iterator<Item: Copy, Item: Copy>,
8484
{
8585
f: ManuallyDrop<T>,
8686
}
87-
union UW3<T>
87+
union Uw3<T>
8888
where
8989
T: Iterator<Item: 'static, Item: 'static>,
9090
{
@@ -110,78 +110,78 @@ where
110110
{
111111
}
112112

113-
fn frpit1() -> impl Iterator<Item: Copy, Item: Send> {
113+
fn rpit1() -> impl Iterator<Item: Copy, Item: Send> {
114114
iter::empty::<u32>()
115115
}
116-
fn frpit2() -> impl Iterator<Item: Copy, Item: Copy> {
116+
fn rpit2() -> impl Iterator<Item: Copy, Item: Copy> {
117117
iter::empty::<u32>()
118118
}
119-
fn frpit3() -> impl Iterator<Item: 'static, Item: 'static> {
119+
fn rpit3() -> impl Iterator<Item: 'static, Item: 'static> {
120120
iter::empty::<u32>()
121121
}
122-
fn fapit1(_: impl Iterator<Item: Copy, Item: Send>) {}
123-
fn fapit2(_: impl Iterator<Item: Copy, Item: Copy>) {}
124-
fn fapit3(_: impl Iterator<Item: 'static, Item: 'static>) {}
122+
fn apit1(_: impl Iterator<Item: Copy, Item: Send>) {}
123+
fn apit2(_: impl Iterator<Item: Copy, Item: Copy>) {}
124+
fn apit3(_: impl Iterator<Item: 'static, Item: 'static>) {}
125125

126-
type TAI1<T: Iterator<Item: Copy, Item: Send>> = T;
127-
type TAI2<T: Iterator<Item: Copy, Item: Copy>> = T;
128-
type TAI3<T: Iterator<Item: 'static, Item: 'static>> = T;
129-
type TAW1<T>
126+
type Tait1<T: Iterator<Item: Copy, Item: Send>> = T;
127+
type Tait2<T: Iterator<Item: Copy, Item: Copy>> = T;
128+
type Tait3<T: Iterator<Item: 'static, Item: 'static>> = T;
129+
type Taw1<T>
130130
where
131131
T: Iterator<Item: Copy, Item: Send>,
132132
= T;
133-
type TAW2<T>
133+
type Taw2<T>
134134
where
135135
T: Iterator<Item: Copy, Item: Copy>,
136136
= T;
137-
type TAW3<T>
137+
type Taw3<T>
138138
where
139139
T: Iterator<Item: 'static, Item: 'static>,
140140
= T;
141141

142-
trait TRI1<T: Iterator<Item: Copy, Item: Send>> {}
143-
trait TRI2<T: Iterator<Item: Copy, Item: Copy>> {}
144-
trait TRI3<T: Iterator<Item: 'static, Item: 'static>> {}
145-
trait TRS1: Iterator<Item: Copy, Item: Send> {}
146-
trait TRS2: Iterator<Item: Copy, Item: Copy> {}
147-
trait TRS3: Iterator<Item: 'static, Item: 'static> {}
148-
trait TRW1<T>
142+
trait Tri1<T: Iterator<Item: Copy, Item: Send>> {}
143+
trait Tri2<T: Iterator<Item: Copy, Item: Copy>> {}
144+
trait Tri3<T: Iterator<Item: 'static, Item: 'static>> {}
145+
trait Trs1: Iterator<Item: Copy, Item: Send> {}
146+
trait Trs2: Iterator<Item: Copy, Item: Copy> {}
147+
trait Trs3: Iterator<Item: 'static, Item: 'static> {}
148+
trait Trw1<T>
149149
where
150150
T: Iterator<Item: Copy, Item: Send>,
151151
{
152152
}
153-
trait TRW2<T>
153+
trait Trw2<T>
154154
where
155155
T: Iterator<Item: Copy, Item: Copy>,
156156
{
157157
}
158-
trait TRW3<T>
158+
trait Trw3<T>
159159
where
160160
T: Iterator<Item: 'static, Item: 'static>,
161161
{
162162
}
163-
trait TRSW1
163+
trait Trsw1
164164
where
165165
Self: Iterator<Item: Copy, Item: Send>,
166166
{
167167
}
168-
trait TRSW2
168+
trait Trsw2
169169
where
170170
Self: Iterator<Item: Copy, Item: Copy>,
171171
{
172172
}
173-
trait TRSW3
173+
trait Trsw3
174174
where
175175
Self: Iterator<Item: 'static, Item: 'static>,
176176
{
177177
}
178-
trait TRA1 {
178+
trait Tra1 {
179179
type A: Iterator<Item: Copy, Item: Send>;
180180
}
181-
trait TRA2 {
181+
trait Tra2 {
182182
type A: Iterator<Item: Copy, Item: Copy>;
183183
}
184-
trait TRA3 {
184+
trait Tra3 {
185185
type A: Iterator<Item: 'static, Item: 'static>;
186186
}
187187

0 commit comments

Comments
 (0)