Skip to content

Commit e120581

Browse files
committed
Fix ui-fulldeps test
1 parent 4de26d7 commit e120581

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

tests/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr

+18-18
Original file line numberDiff line numberDiff line change
@@ -542,68 +542,68 @@ error[E0433]: cannot find item `core` in the crate root
542542
LL | #[suggestion(code = 3)]
543543
| ^ you might be missing a crate named `core`
544544

545-
error: cannot find attribute `nonsense` in this scope
545+
error: cannot find attribute `nonsense` in the crate root
546546
--> $DIR/diagnostic-derive.rs:63:3
547547
|
548548
LL | #[nonsense(no_crate_example, code = E0123)]
549-
| ^^^^^^^^ not found in this scope
549+
| ^^^^^^^^ not found in the crate root
550550

551-
error: cannot find attribute `nonsense` in this scope
551+
error: cannot find attribute `nonsense` in the crate root
552552
--> $DIR/diagnostic-derive.rs:150:7
553553
|
554554
LL | #[nonsense]
555-
| ^^^^^^^^ not found in this scope
555+
| ^^^^^^^^ not found in the crate root
556556

557-
error: cannot find attribute `error` in this scope
557+
error: cannot find attribute `error` in the crate root
558558
--> $DIR/diagnostic-derive.rs:583:3
559559
|
560560
LL | #[error(no_crate_example, code = E0123)]
561-
| ^^^^^ not found in this scope
561+
| ^^^^^ not found in the crate root
562562

563-
error: cannot find attribute `warn_` in this scope
563+
error: cannot find attribute `warn_` in the crate root
564564
--> $DIR/diagnostic-derive.rs:590:3
565565
|
566566
LL | #[warn_(no_crate_example, code = E0123)]
567567
| ^^^^^
568568
| |
569-
| not found in this scope
569+
| not found in the crate root
570570
| help: a built-in attribute with a similar name exists: `warn`
571571

572-
error: cannot find attribute `lint` in this scope
572+
error: cannot find attribute `lint` in the crate root
573573
--> $DIR/diagnostic-derive.rs:597:3
574574
|
575575
LL | #[lint(no_crate_example, code = E0123)]
576576
| ^^^^
577577
| |
578-
| not found in this scope
578+
| not found in the crate root
579579
| help: a built-in attribute with a similar name exists: `link`
580580

581-
error: cannot find attribute `lint` in this scope
581+
error: cannot find attribute `lint` in the crate root
582582
--> $DIR/diagnostic-derive.rs:604:3
583583
|
584584
LL | #[lint(no_crate_example, code = E0123)]
585585
| ^^^^
586586
| |
587-
| not found in this scope
587+
| not found in the crate root
588588
| help: a built-in attribute with a similar name exists: `link`
589589

590-
error: cannot find attribute `multipart_suggestion` in this scope
590+
error: cannot find attribute `multipart_suggestion` in the crate root
591591
--> $DIR/diagnostic-derive.rs:644:3
592592
|
593593
LL | #[multipart_suggestion(no_crate_suggestion)]
594-
| ^^^^^^^^^^^^^^^^^^^^ not found in this scope
594+
| ^^^^^^^^^^^^^^^^^^^^ not found in the crate root
595595

596-
error: cannot find attribute `multipart_suggestion` in this scope
596+
error: cannot find attribute `multipart_suggestion` in the crate root
597597
--> $DIR/diagnostic-derive.rs:647:3
598598
|
599599
LL | #[multipart_suggestion()]
600-
| ^^^^^^^^^^^^^^^^^^^^ not found in this scope
600+
| ^^^^^^^^^^^^^^^^^^^^ not found in the crate root
601601

602-
error: cannot find attribute `multipart_suggestion` in this scope
602+
error: cannot find attribute `multipart_suggestion` in the crate root
603603
--> $DIR/diagnostic-derive.rs:651:7
604604
|
605605
LL | #[multipart_suggestion(no_crate_suggestion)]
606-
| ^^^^^^^^^^^^^^^^^^^^ not found in this scope
606+
| ^^^^^^^^^^^^^^^^^^^^ not found in the crate root
607607

608608
error[E0425]: cannot find value `nonsense` in module `crate::fluent_generated`
609609
--> $DIR/diagnostic-derive.rs:75:8

tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ struct D {
6767
#[foo]
6868
//~^ ERROR `#[foo]` is not a valid attribute
6969
//~| ERROR cannot find attribute `foo`
70-
//~| NOTE not found in this scope
70+
//~| NOTE not found in
7171
struct E {
7272
#[primary_span]
7373
span: Span,
@@ -164,7 +164,7 @@ struct O {
164164
#[foo]
165165
//~^ ERROR cannot find attribute `foo`
166166
//~| ERROR unsupported type attribute for subdiagnostic enum
167-
//~| NOTE not found in this scope
167+
//~| NOTE not found in
168168
enum P {
169169
#[label(no_crate_example)]
170170
A {
@@ -179,7 +179,7 @@ enum Q {
179179
#[bar]
180180
//~^ ERROR `#[bar]` is not a valid attribute
181181
//~| ERROR cannot find attribute `bar`
182-
//~| NOTE not found in this scope
182+
//~| NOTE not found in
183183
A {
184184
#[primary_span]
185185
span: Span,
@@ -192,7 +192,7 @@ enum R {
192192
#[bar = "..."]
193193
//~^ ERROR `#[bar = ...]` is not a valid attribute
194194
//~| ERROR cannot find attribute `bar`
195-
//~| NOTE not found in this scope
195+
//~| NOTE not found in
196196
A {
197197
#[primary_span]
198198
span: Span,
@@ -205,7 +205,7 @@ enum S {
205205
#[bar = 4]
206206
//~^ ERROR `#[bar = ...]` is not a valid attribute
207207
//~| ERROR cannot find attribute `bar`
208-
//~| NOTE not found in this scope
208+
//~| NOTE not found in
209209
A {
210210
#[primary_span]
211211
span: Span,
@@ -218,7 +218,7 @@ enum T {
218218
#[bar("...")]
219219
//~^ ERROR `#[bar(...)]` is not a valid attribute
220220
//~| ERROR cannot find attribute `bar`
221-
//~| NOTE not found in this scope
221+
//~| NOTE not found in
222222
A {
223223
#[primary_span]
224224
span: Span,
@@ -280,7 +280,7 @@ struct Y {
280280
#[bar]
281281
//~^ ERROR `#[bar]` is not a valid attribute
282282
//~| ERROR cannot find attribute `bar`
283-
//~| NOTE not found in this scope
283+
//~| NOTE not found in
284284
bar: String,
285285
}
286286

@@ -292,7 +292,7 @@ struct Z {
292292
#[bar = "..."]
293293
//~^ ERROR `#[bar = ...]` is not a valid attribute
294294
//~| ERROR cannot find attribute `bar`
295-
//~| NOTE not found in this scope
295+
//~| NOTE not found in
296296
bar: String,
297297
}
298298

@@ -304,7 +304,7 @@ struct AA {
304304
#[bar("...")]
305305
//~^ ERROR `#[bar(...)]` is not a valid attribute
306306
//~| ERROR cannot find attribute `bar`
307-
//~| NOTE not found in this scope
307+
//~| NOTE not found in
308308
bar: String,
309309
}
310310

@@ -723,7 +723,7 @@ struct BP {
723723
#[derive(Subdiagnostic)]
724724
//~^ ERROR cannot find value `__code_29`
725725
//~| NOTE in this expansion
726-
//~| NOTE not found in this scope
726+
//~| NOTE not found in
727727
#[multipart_suggestion(no_crate_example)]
728728
struct BQ {
729729
#[suggestion_part(code = 3)]

tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.stderr

+18-18
Original file line numberDiff line numberDiff line change
@@ -499,59 +499,59 @@ error[E0433]: cannot find item `core` in the crate root
499499
LL | #[suggestion(no_crate_example, code = "", style("foo"))]
500500
| ^ you might be missing a crate named `core`
501501

502-
error: cannot find attribute `foo` in this scope
502+
error: cannot find attribute `foo` in the crate root
503503
--> $DIR/subdiagnostic-derive.rs:67:3
504504
|
505505
LL | #[foo]
506-
| ^^^ not found in this scope
506+
| ^^^ not found in the crate root
507507

508-
error: cannot find attribute `foo` in this scope
508+
error: cannot find attribute `foo` in the crate root
509509
--> $DIR/subdiagnostic-derive.rs:164:3
510510
|
511511
LL | #[foo]
512-
| ^^^ not found in this scope
512+
| ^^^ not found in the crate root
513513

514-
error: cannot find attribute `bar` in this scope
514+
error: cannot find attribute `bar` in enum `Q`
515515
--> $DIR/subdiagnostic-derive.rs:179:7
516516
|
517517
LL | #[bar]
518-
| ^^^ not found in this scope
518+
| ^^^ not found in enum `Q`
519519

520-
error: cannot find attribute `bar` in this scope
520+
error: cannot find attribute `bar` in enum `R`
521521
--> $DIR/subdiagnostic-derive.rs:192:7
522522
|
523523
LL | #[bar = "..."]
524-
| ^^^ not found in this scope
524+
| ^^^ not found in enum `R`
525525

526-
error: cannot find attribute `bar` in this scope
526+
error: cannot find attribute `bar` in enum `S`
527527
--> $DIR/subdiagnostic-derive.rs:205:7
528528
|
529529
LL | #[bar = 4]
530-
| ^^^ not found in this scope
530+
| ^^^ not found in enum `S`
531531

532-
error: cannot find attribute `bar` in this scope
532+
error: cannot find attribute `bar` in enum `T`
533533
--> $DIR/subdiagnostic-derive.rs:218:7
534534
|
535535
LL | #[bar("...")]
536-
| ^^^ not found in this scope
536+
| ^^^ not found in enum `T`
537537

538-
error: cannot find attribute `bar` in this scope
538+
error: cannot find attribute `bar` in the crate root
539539
--> $DIR/subdiagnostic-derive.rs:280:7
540540
|
541541
LL | #[bar]
542-
| ^^^ not found in this scope
542+
| ^^^ not found in the crate root
543543

544-
error: cannot find attribute `bar` in this scope
544+
error: cannot find attribute `bar` in the crate root
545545
--> $DIR/subdiagnostic-derive.rs:292:7
546546
|
547547
LL | #[bar = "..."]
548-
| ^^^ not found in this scope
548+
| ^^^ not found in the crate root
549549

550-
error: cannot find attribute `bar` in this scope
550+
error: cannot find attribute `bar` in the crate root
551551
--> $DIR/subdiagnostic-derive.rs:304:7
552552
|
553553
LL | #[bar("...")]
554-
| ^^^ not found in this scope
554+
| ^^^ not found in the crate root
555555

556556
error[E0425]: cannot find value `slug` in module `crate::fluent_generated`
557557
--> $DIR/subdiagnostic-derive.rs:127:9

0 commit comments

Comments
 (0)