Skip to content

Commit 5779fff

Browse files
committed
update stability compile-fail tests
1 parent 836cdf0 commit 5779fff

File tree

2 files changed

+39
-8
lines changed

2 files changed

+39
-8
lines changed

src/test/compile-fail/lint-stability-fields.rs

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,20 @@ mod cross_crate {
116116
//~^ ERROR use of deprecated item
117117
//~^^ ERROR use of unstable
118118
override1: 2,
119-
override2: 3, //~ ERROR use of unstable
119+
//~^ ERROR use of deprecated item
120+
override2: 3,
121+
//~^ ERROR use of deprecated item
122+
//~^^ ERROR use of unstable
120123
};
121124

122125
let _ = x.inherit;
123126
//~^ ERROR use of deprecated item
124127
//~^^ ERROR use of unstable
125128
let _ = x.override1;
126-
let _ = x.override2; //~ ERROR use of unstable
129+
//~^ ERROR use of deprecated item
130+
let _ = x.override2;
131+
//~^ ERROR use of deprecated item
132+
//~^^ ERROR use of unstable
127133

128134
let Deprecated {
129135
//~^ ERROR use of deprecated item
@@ -132,7 +138,10 @@ mod cross_crate {
132138
//~^ ERROR use of deprecated item
133139
//~^^ ERROR use of unstable
134140
override1: _,
135-
override2: _ //~ ERROR use of unstable
141+
//~^ ERROR use of deprecated item
142+
override2: _
143+
//~^ ERROR use of unstable
144+
//~^^ ERROR use of deprecated item
136145
} = x;
137146

138147
let Deprecated
@@ -149,7 +158,10 @@ mod cross_crate {
149158
//~^ ERROR use of deprecated item
150159
//~^^ ERROR use of unstable
151160
let _ = x.1;
152-
let _ = x.2; //~ ERROR use of unstable
161+
//~^ ERROR use of deprecated item
162+
let _ = x.2;
163+
//~^ ERROR use of deprecated item
164+
//~^^ ERROR use of unstable
153165

154166
let Deprecated2
155167
//~^ ERROR use of deprecated item
@@ -158,7 +170,10 @@ mod cross_crate {
158170
//~^ ERROR use of deprecated item
159171
//~^^ ERROR use of unstable
160172
_,
161-
_) //~ ERROR use of unstable
173+
//~^ ERROR use of deprecated item
174+
_)
175+
//~^ ERROR use of deprecated item
176+
//~^^ ERROR use of unstable
162177
= x;
163178
let Deprecated2
164179
//~^ ERROR use of deprecated item
@@ -300,20 +315,26 @@ mod this_crate {
300315
inherit: 1,
301316
//~^ ERROR use of deprecated item
302317
override1: 2,
318+
//~^ ERROR use of deprecated item
303319
override2: 3,
320+
//~^ ERROR use of deprecated item
304321
};
305322

306323
let _ = x.inherit;
307324
//~^ ERROR use of deprecated item
308325
let _ = x.override1;
326+
//~^ ERROR use of deprecated item
309327
let _ = x.override2;
328+
//~^ ERROR use of deprecated item
310329

311330
let Deprecated {
312331
//~^ ERROR use of deprecated item
313332
inherit: _,
314333
//~^ ERROR use of deprecated item
315334
override1: _,
335+
//~^ ERROR use of deprecated item
316336
override2: _
337+
//~^ ERROR use of deprecated item
317338
} = x;
318339

319340
let Deprecated
@@ -327,14 +348,18 @@ mod this_crate {
327348
let _ = x.0;
328349
//~^ ERROR use of deprecated item
329350
let _ = x.1;
351+
//~^ ERROR use of deprecated item
330352
let _ = x.2;
353+
//~^ ERROR use of deprecated item
331354

332355
let Deprecated2
333356
//~^ ERROR use of deprecated item
334357
(_,
335358
//~^ ERROR use of deprecated item
336359
_,
360+
//~^ ERROR use of deprecated item
337361
_)
362+
//~^ ERROR use of deprecated item
338363
= x;
339364
let Deprecated2
340365
//~^ ERROR use of deprecated item

src/test/compile-fail/lint-stability.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,11 @@ mod cross_crate {
128128
<Foo as Trait>::trait_stable_text(&foo);
129129

130130
let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item
131-
let _ = DeprecatedUnstableStruct { i: 0 }; //~ ERROR use of deprecated item
132-
//~^ ERROR use of unstable library feature
131+
let _ = DeprecatedUnstableStruct {
132+
//~^ ERROR use of deprecated item
133+
//~^^ ERROR use of unstable library feature
134+
i: 0 //~ ERROR use of deprecated item
135+
};
133136
let _ = UnstableStruct { i: 0 }; //~ ERROR use of unstable library feature
134137
let _ = StableStruct { i: 0 };
135138

@@ -417,7 +420,10 @@ mod this_crate {
417420
<Foo>::trait_stable_text(&foo);
418421
<Foo as Trait>::trait_stable_text(&foo);
419422

420-
let _ = DeprecatedStruct { i: 0 }; //~ ERROR use of deprecated item
423+
let _ = DeprecatedStruct {
424+
//~^ ERROR use of deprecated item
425+
i: 0 //~ ERROR use of deprecated item
426+
};
421427
let _ = UnstableStruct { i: 0 };
422428
let _ = StableStruct { i: 0 };
423429

0 commit comments

Comments
 (0)