Skip to content

Commit 68d3892

Browse files
flip1995flip1995
committed
Remove fixed FIXMEs from tests
1 parent 0ffe7c2 commit 68d3892

File tree

3 files changed

+28
-56
lines changed

3 files changed

+28
-56
lines changed

‎tests/ui/use_self.fixed

-14
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@ mod use_self {
1515
Self {}
1616
}
1717
fn test() -> Self {
18-
// FIXME: applicable here
1918
Self::new()
2019
}
2120
}
2221

2322
impl Default for Foo {
24-
// FIXME: applicable here
2523
fn default() -> Self {
26-
// FIXME: applicable here
2724
Self::new()
2825
}
2926
}
@@ -89,10 +86,6 @@ mod existential {
8986
struct Foo;
9087

9188
impl Foo {
92-
// FIXME:
93-
// TyKind::Def (used for `impl Trait` types) does not include type parameters yet.
94-
// See documentation in rustc_hir::hir::TyKind.
95-
// The hir tree walk stops at `impl Iterator` level and does not inspect &Foo.
9689
fn bad(foos: &[Self]) -> impl Iterator<Item = &Self> {
9790
foos.iter()
9891
}
@@ -214,9 +207,7 @@ mod rustfix {
214207
fn fun_1() {}
215208

216209
fn fun_2() {
217-
// FIXME: applicable here
218210
Self::fun_1();
219-
// FIXME: applicable here
220211
Self::A;
221212

222213
Self {};
@@ -238,7 +229,6 @@ mod issue3567 {
238229

239230
impl Test for TestStruct {
240231
fn test() -> TestStruct {
241-
// FIXME: applicable here
242232
Self::from_something()
243233
}
244234
}
@@ -253,13 +243,11 @@ mod paths_created_by_lowering {
253243
const A: usize = 0;
254244
const B: usize = 1;
255245

256-
// FIXME: applicable here
257246
async fn g() -> Self {
258247
Self {}
259248
}
260249

261250
fn f<'a>(&self, p: &'a [u8]) -> &'a [u8] {
262-
// FIXME: applicable here twice
263251
&p[Self::A..Self::B]
264252
}
265253
}
@@ -380,7 +368,6 @@ mod issue4305 {
380368

381369
impl<T: Foo> From<T> for Box<dyn Foo> {
382370
fn from(t: T) -> Self {
383-
// FIXME: applicable here
384371
Box::new(t)
385372
}
386373
}
@@ -460,7 +447,6 @@ mod nested_paths {
460447

461448
impl A<submod::C> {
462449
fn test() -> Self {
463-
// FIXME: applicable here
464450
Self::new::<submod::B>(submod::B {})
465451
}
466452
}

‎tests/ui/use_self.rs

-14
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@ mod use_self {
1515
Foo {}
1616
}
1717
fn test() -> Foo {
18-
// FIXME: applicable here
1918
Foo::new()
2019
}
2120
}
2221

2322
impl Default for Foo {
24-
// FIXME: applicable here
2523
fn default() -> Foo {
26-
// FIXME: applicable here
2724
Foo::new()
2825
}
2926
}
@@ -89,10 +86,6 @@ mod existential {
8986
struct Foo;
9087

9188
impl Foo {
92-
// FIXME:
93-
// TyKind::Def (used for `impl Trait` types) does not include type parameters yet.
94-
// See documentation in rustc_hir::hir::TyKind.
95-
// The hir tree walk stops at `impl Iterator` level and does not inspect &Foo.
9689
fn bad(foos: &[Foo]) -> impl Iterator<Item = &Foo> {
9790
foos.iter()
9891
}
@@ -214,9 +207,7 @@ mod rustfix {
214207
fn fun_1() {}
215208

216209
fn fun_2() {
217-
// FIXME: applicable here
218210
nested::A::fun_1();
219-
// FIXME: applicable here
220211
nested::A::A;
221212

222213
nested::A {};
@@ -238,7 +229,6 @@ mod issue3567 {
238229

239230
impl Test for TestStruct {
240231
fn test() -> TestStruct {
241-
// FIXME: applicable here
242232
TestStruct::from_something()
243233
}
244234
}
@@ -253,13 +243,11 @@ mod paths_created_by_lowering {
253243
const A: usize = 0;
254244
const B: usize = 1;
255245

256-
// FIXME: applicable here
257246
async fn g() -> S {
258247
S {}
259248
}
260249

261250
fn f<'a>(&self, p: &'a [u8]) -> &'a [u8] {
262-
// FIXME: applicable here twice
263251
&p[S::A..S::B]
264252
}
265253
}
@@ -380,7 +368,6 @@ mod issue4305 {
380368

381369
impl<T: Foo> From<T> for Box<dyn Foo> {
382370
fn from(t: T) -> Self {
383-
// FIXME: applicable here
384371
Box::new(t)
385372
}
386373
}
@@ -460,7 +447,6 @@ mod nested_paths {
460447

461448
impl A<submod::C> {
462449
fn test() -> Self {
463-
// FIXME: applicable here
464450
A::new::<submod::B>(submod::B {})
465451
}
466452
}

‎tests/ui/use_self.stderr

+28-28
Original file line numberDiff line numberDiff line change
@@ -19,43 +19,43 @@ LL | fn test() -> Foo {
1919
| ^^^ help: use the applicable keyword: `Self`
2020

2121
error: unnecessary structure name repetition
22-
--> $DIR/use_self.rs:19:13
22+
--> $DIR/use_self.rs:18:13
2323
|
2424
LL | Foo::new()
2525
| ^^^ help: use the applicable keyword: `Self`
2626

2727
error: unnecessary structure name repetition
28-
--> $DIR/use_self.rs:25:25
28+
--> $DIR/use_self.rs:23:25
2929
|
3030
LL | fn default() -> Foo {
3131
| ^^^ help: use the applicable keyword: `Self`
3232

3333
error: unnecessary structure name repetition
34-
--> $DIR/use_self.rs:27:13
34+
--> $DIR/use_self.rs:24:13
3535
|
3636
LL | Foo::new()
3737
| ^^^ help: use the applicable keyword: `Self`
3838

3939
error: unnecessary structure name repetition
40-
--> $DIR/use_self.rs:96:24
40+
--> $DIR/use_self.rs:89:24
4141
|
4242
LL | fn bad(foos: &[Foo]) -> impl Iterator<Item = &Foo> {
4343
| ^^^ help: use the applicable keyword: `Self`
4444

4545
error: unnecessary structure name repetition
46-
--> $DIR/use_self.rs:96:55
46+
--> $DIR/use_self.rs:89:55
4747
|
4848
LL | fn bad(foos: &[Foo]) -> impl Iterator<Item = &Foo> {
4949
| ^^^ help: use the applicable keyword: `Self`
5050

5151
error: unnecessary structure name repetition
52-
--> $DIR/use_self.rs:111:13
52+
--> $DIR/use_self.rs:104:13
5353
|
5454
LL | TS(0)
5555
| ^^ help: use the applicable keyword: `Self`
5656

5757
error: unnecessary structure name repetition
58-
--> $DIR/use_self.rs:119:25
58+
--> $DIR/use_self.rs:112:25
5959
|
6060
LL | fn new() -> Foo {
6161
| ^^^ help: use the applicable keyword: `Self`
@@ -66,7 +66,7 @@ LL | use_self_expand!(); // Should lint in local macros
6666
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
6767

6868
error: unnecessary structure name repetition
69-
--> $DIR/use_self.rs:120:17
69+
--> $DIR/use_self.rs:113:17
7070
|
7171
LL | Foo {}
7272
| ^^^ help: use the applicable keyword: `Self`
@@ -77,121 +77,121 @@ LL | use_self_expand!(); // Should lint in local macros
7777
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
7878

7979
error: unnecessary structure name repetition
80-
--> $DIR/use_self.rs:143:29
80+
--> $DIR/use_self.rs:136:29
8181
|
8282
LL | fn bar() -> Bar {
8383
| ^^^ help: use the applicable keyword: `Self`
8484

8585
error: unnecessary structure name repetition
86-
--> $DIR/use_self.rs:144:21
86+
--> $DIR/use_self.rs:137:21
8787
|
8888
LL | Bar { foo: Foo {} }
8989
| ^^^ help: use the applicable keyword: `Self`
9090

9191
error: unnecessary structure name repetition
92-
--> $DIR/use_self.rs:155:21
92+
--> $DIR/use_self.rs:148:21
9393
|
9494
LL | fn baz() -> Foo {
9595
| ^^^ help: use the applicable keyword: `Self`
9696

9797
error: unnecessary structure name repetition
98-
--> $DIR/use_self.rs:156:13
98+
--> $DIR/use_self.rs:149:13
9999
|
100100
LL | Foo {}
101101
| ^^^ help: use the applicable keyword: `Self`
102102

103103
error: unnecessary structure name repetition
104-
--> $DIR/use_self.rs:173:21
104+
--> $DIR/use_self.rs:166:21
105105
|
106106
LL | let _ = Enum::B(42);
107107
| ^^^^ help: use the applicable keyword: `Self`
108108

109109
error: unnecessary structure name repetition
110-
--> $DIR/use_self.rs:174:21
110+
--> $DIR/use_self.rs:167:21
111111
|
112112
LL | let _ = Enum::C { field: true };
113113
| ^^^^ help: use the applicable keyword: `Self`
114114

115115
error: unnecessary structure name repetition
116-
--> $DIR/use_self.rs:175:21
116+
--> $DIR/use_self.rs:168:21
117117
|
118118
LL | let _ = Enum::A;
119119
| ^^^^ help: use the applicable keyword: `Self`
120120

121121
error: unnecessary structure name repetition
122-
--> $DIR/use_self.rs:218:13
122+
--> $DIR/use_self.rs:210:13
123123
|
124124
LL | nested::A::fun_1();
125125
| ^^^^^^^^^ help: use the applicable keyword: `Self`
126126

127127
error: unnecessary structure name repetition
128-
--> $DIR/use_self.rs:220:13
128+
--> $DIR/use_self.rs:211:13
129129
|
130130
LL | nested::A::A;
131131
| ^^^^^^^^^ help: use the applicable keyword: `Self`
132132

133133
error: unnecessary structure name repetition
134-
--> $DIR/use_self.rs:222:13
134+
--> $DIR/use_self.rs:213:13
135135
|
136136
LL | nested::A {};
137137
| ^^^^^^^^^ help: use the applicable keyword: `Self`
138138

139139
error: unnecessary structure name repetition
140-
--> $DIR/use_self.rs:242:13
140+
--> $DIR/use_self.rs:232:13
141141
|
142142
LL | TestStruct::from_something()
143143
| ^^^^^^^^^^ help: use the applicable keyword: `Self`
144144

145145
error: unnecessary structure name repetition
146-
--> $DIR/use_self.rs:257:25
146+
--> $DIR/use_self.rs:246:25
147147
|
148148
LL | async fn g() -> S {
149149
| ^ help: use the applicable keyword: `Self`
150150

151151
error: unnecessary structure name repetition
152-
--> $DIR/use_self.rs:258:13
152+
--> $DIR/use_self.rs:247:13
153153
|
154154
LL | S {}
155155
| ^ help: use the applicable keyword: `Self`
156156

157157
error: unnecessary structure name repetition
158-
--> $DIR/use_self.rs:263:16
158+
--> $DIR/use_self.rs:251:16
159159
|
160160
LL | &p[S::A..S::B]
161161
| ^ help: use the applicable keyword: `Self`
162162

163163
error: unnecessary structure name repetition
164-
--> $DIR/use_self.rs:263:22
164+
--> $DIR/use_self.rs:251:22
165165
|
166166
LL | &p[S::A..S::B]
167167
| ^ help: use the applicable keyword: `Self`
168168

169169
error: unnecessary structure name repetition
170-
--> $DIR/use_self.rs:286:29
170+
--> $DIR/use_self.rs:274:29
171171
|
172172
LL | fn foo(value: T) -> Foo<T> {
173173
| ^^^^^^ help: use the applicable keyword: `Self`
174174

175175
error: unnecessary structure name repetition
176-
--> $DIR/use_self.rs:287:13
176+
--> $DIR/use_self.rs:275:13
177177
|
178178
LL | Foo { value }
179179
| ^^^ help: use the applicable keyword: `Self`
180180

181181
error: unnecessary structure name repetition
182-
--> $DIR/use_self.rs:324:21
182+
--> $DIR/use_self.rs:312:21
183183
|
184184
LL | type From = T::From;
185185
| ^^^^^^^ help: use the applicable keyword: `Self`
186186

187187
error: unnecessary structure name repetition
188-
--> $DIR/use_self.rs:325:19
188+
--> $DIR/use_self.rs:313:19
189189
|
190190
LL | type To = T::To;
191191
| ^^^^^ help: use the applicable keyword: `Self`
192192

193193
error: unnecessary structure name repetition
194-
--> $DIR/use_self.rs:464:13
194+
--> $DIR/use_self.rs:451:13
195195
|
196196
LL | A::new::<submod::B>(submod::B {})
197197
| ^ help: use the applicable keyword: `Self`

0 commit comments

Comments
 (0)