diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-07 12:27:17 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-07 12:27:17 +0000 |
commit | 7967ce85cfc5fc2b1996425b44f2a45d0841c8ff (patch) | |
tree | 4495b9de7ea6c8e9dd9fd347d42517e9dee511fa /crates/ide/src/goto_definition.rs | |
parent | c3e9fb183bc287d83b97b776edc87c54d18d1a73 (diff) | |
parent | 72b9a4fbd3c12f3250b9157a1d44230e04ec8b22 (diff) |
Merge #7184
7184: Changes Cursor Marker To $0 r=matklad a=kevaundray
Co-authored-by: Kevaundray Wedderburn <[email protected]>
Diffstat (limited to 'crates/ide/src/goto_definition.rs')
-rw-r--r-- | crates/ide/src/goto_definition.rs | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs index 912144f8b..95b4cb9e3 100644 --- a/crates/ide/src/goto_definition.rs +++ b/crates/ide/src/goto_definition.rs | |||
@@ -166,7 +166,7 @@ mod tests { | |||
166 | check( | 166 | check( |
167 | r#" | 167 | r#" |
168 | //- /main.rs crate:main deps:std | 168 | //- /main.rs crate:main deps:std |
169 | extern crate std<|>; | 169 | extern crate std$0; |
170 | //- /std/lib.rs crate:std | 170 | //- /std/lib.rs crate:std |
171 | // empty | 171 | // empty |
172 | //^ file | 172 | //^ file |
@@ -179,7 +179,7 @@ mod tests { | |||
179 | check( | 179 | check( |
180 | r#" | 180 | r#" |
181 | //- /main.rs crate:main deps:std | 181 | //- /main.rs crate:main deps:std |
182 | extern crate std as abc<|>; | 182 | extern crate std as abc$0; |
183 | //- /std/lib.rs crate:std | 183 | //- /std/lib.rs crate:std |
184 | // empty | 184 | // empty |
185 | //^ file | 185 | //^ file |
@@ -193,7 +193,7 @@ mod tests { | |||
193 | r#" | 193 | r#" |
194 | struct Foo; | 194 | struct Foo; |
195 | //^^^ | 195 | //^^^ |
196 | enum E { X(Foo<|>) } | 196 | enum E { X(Foo$0) } |
197 | "#, | 197 | "#, |
198 | ); | 198 | ); |
199 | } | 199 | } |
@@ -204,7 +204,7 @@ enum E { X(Foo<|>) } | |||
204 | r#" | 204 | r#" |
205 | struct Foo; | 205 | struct Foo; |
206 | //^^^ | 206 | //^^^ |
207 | enum E { X(<|>Foo) } | 207 | enum E { X($0Foo) } |
208 | "#, | 208 | "#, |
209 | ); | 209 | ); |
210 | } | 210 | } |
@@ -217,7 +217,7 @@ enum E { X(<|>Foo) } | |||
217 | use a::Foo; | 217 | use a::Foo; |
218 | mod a; | 218 | mod a; |
219 | mod b; | 219 | mod b; |
220 | enum E { X(Foo<|>) } | 220 | enum E { X(Foo$0) } |
221 | 221 | ||
222 | //- /a.rs | 222 | //- /a.rs |
223 | struct Foo; | 223 | struct Foo; |
@@ -233,7 +233,7 @@ struct Foo; | |||
233 | check( | 233 | check( |
234 | r#" | 234 | r#" |
235 | //- /lib.rs | 235 | //- /lib.rs |
236 | mod <|>foo; | 236 | mod $0foo; |
237 | 237 | ||
238 | //- /foo.rs | 238 | //- /foo.rs |
239 | // empty | 239 | // empty |
@@ -244,7 +244,7 @@ mod <|>foo; | |||
244 | check( | 244 | check( |
245 | r#" | 245 | r#" |
246 | //- /lib.rs | 246 | //- /lib.rs |
247 | mod <|>foo; | 247 | mod $0foo; |
248 | 248 | ||
249 | //- /foo/mod.rs | 249 | //- /foo/mod.rs |
250 | // empty | 250 | // empty |
@@ -260,7 +260,7 @@ mod <|>foo; | |||
260 | macro_rules! foo { () => { () } } | 260 | macro_rules! foo { () => { () } } |
261 | //^^^ | 261 | //^^^ |
262 | fn bar() { | 262 | fn bar() { |
263 | <|>foo!(); | 263 | $0foo!(); |
264 | } | 264 | } |
265 | "#, | 265 | "#, |
266 | ); | 266 | ); |
@@ -273,7 +273,7 @@ fn bar() { | |||
273 | //- /lib.rs | 273 | //- /lib.rs |
274 | use foo::foo; | 274 | use foo::foo; |
275 | fn bar() { | 275 | fn bar() { |
276 | <|>foo!(); | 276 | $0foo!(); |
277 | } | 277 | } |
278 | 278 | ||
279 | //- /foo/lib.rs | 279 | //- /foo/lib.rs |
@@ -289,7 +289,7 @@ macro_rules! foo { () => { () } } | |||
289 | check( | 289 | check( |
290 | r#" | 290 | r#" |
291 | //- /lib.rs | 291 | //- /lib.rs |
292 | use foo::foo<|>; | 292 | use foo::foo$0; |
293 | 293 | ||
294 | //- /foo/lib.rs | 294 | //- /foo/lib.rs |
295 | #[macro_export] | 295 | #[macro_export] |
@@ -312,7 +312,7 @@ define_fn!(foo); | |||
312 | //^^^ | 312 | //^^^ |
313 | 313 | ||
314 | fn bar() { | 314 | fn bar() { |
315 | <|>foo(); | 315 | $0foo(); |
316 | } | 316 | } |
317 | "#, | 317 | "#, |
318 | ); | 318 | ); |
@@ -331,7 +331,7 @@ macro_rules! define_fn { | |||
331 | //^^^^^^^^^^^^^ | 331 | //^^^^^^^^^^^^^ |
332 | 332 | ||
333 | fn bar() { | 333 | fn bar() { |
334 | <|>foo(); | 334 | $0foo(); |
335 | } | 335 | } |
336 | "#, | 336 | "#, |
337 | ); | 337 | ); |
@@ -347,7 +347,7 @@ macro_rules! foo {() => {0}} | |||
347 | 347 | ||
348 | fn bar() { | 348 | fn bar() { |
349 | match (0,1) { | 349 | match (0,1) { |
350 | (<|>foo!(), _) => {} | 350 | ($0foo!(), _) => {} |
351 | } | 351 | } |
352 | } | 352 | } |
353 | "#, | 353 | "#, |
@@ -363,7 +363,7 @@ macro_rules! foo {() => {0}} | |||
363 | //^^^ | 363 | //^^^ |
364 | fn bar() { | 364 | fn bar() { |
365 | match 0 { | 365 | match 0 { |
366 | <|>foo!() => {} | 366 | $0foo!() => {} |
367 | } | 367 | } |
368 | } | 368 | } |
369 | "#, | 369 | "#, |
@@ -375,7 +375,7 @@ fn bar() { | |||
375 | check( | 375 | check( |
376 | r#" | 376 | r#" |
377 | //- /lib.rs crate:main deps:foo | 377 | //- /lib.rs crate:main deps:foo |
378 | use foo as bar<|>; | 378 | use foo as bar$0; |
379 | 379 | ||
380 | //- /foo/lib.rs crate:foo | 380 | //- /foo/lib.rs crate:foo |
381 | // empty | 381 | // empty |
@@ -389,7 +389,7 @@ use foo as bar<|>; | |||
389 | check( | 389 | check( |
390 | r#" | 390 | r#" |
391 | //- /lib.rs crate:main deps:foo | 391 | //- /lib.rs crate:main deps:foo |
392 | use foo::foo as bar<|>; | 392 | use foo::foo as bar$0; |
393 | 393 | ||
394 | //- /foo/lib.rs crate:foo | 394 | //- /foo/lib.rs crate:foo |
395 | #[macro_export] | 395 | #[macro_export] |
@@ -410,7 +410,7 @@ impl Foo { | |||
410 | } | 410 | } |
411 | 411 | ||
412 | fn bar(foo: &Foo) { | 412 | fn bar(foo: &Foo) { |
413 | foo.frobnicate<|>(); | 413 | foo.frobnicate$0(); |
414 | } | 414 | } |
415 | "#, | 415 | "#, |
416 | ); | 416 | ); |
@@ -425,7 +425,7 @@ struct Foo { | |||
425 | } //^^^^ | 425 | } //^^^^ |
426 | 426 | ||
427 | fn bar(foo: &Foo) { | 427 | fn bar(foo: &Foo) { |
428 | foo.spam<|>; | 428 | foo.spam$0; |
429 | } | 429 | } |
430 | "#, | 430 | "#, |
431 | ); | 431 | ); |
@@ -442,7 +442,7 @@ struct Foo { | |||
442 | 442 | ||
443 | fn bar() -> Foo { | 443 | fn bar() -> Foo { |
444 | Foo { | 444 | Foo { |
445 | spam<|>: 0, | 445 | spam$0: 0, |
446 | } | 446 | } |
447 | } | 447 | } |
448 | "#, | 448 | "#, |
@@ -459,7 +459,7 @@ struct Foo { | |||
459 | } //^^^^ | 459 | } //^^^^ |
460 | 460 | ||
461 | fn bar(foo: Foo) -> Foo { | 461 | fn bar(foo: Foo) -> Foo { |
462 | let Foo { spam<|>: _, } = foo | 462 | let Foo { spam$0: _, } = foo |
463 | } | 463 | } |
464 | "#, | 464 | "#, |
465 | ); | 465 | ); |
@@ -474,7 +474,7 @@ struct Foo { spam: u32 } | |||
474 | //^^^^ | 474 | //^^^^ |
475 | 475 | ||
476 | fn bar() -> Foo { | 476 | fn bar() -> Foo { |
477 | Foo { spam<|>: m!() } | 477 | Foo { spam$0: m!() } |
478 | } | 478 | } |
479 | ", | 479 | ", |
480 | ); | 480 | ); |
@@ -489,7 +489,7 @@ struct Foo(u32); | |||
489 | 489 | ||
490 | fn bar() { | 490 | fn bar() { |
491 | let foo = Foo(0); | 491 | let foo = Foo(0); |
492 | foo.<|>0; | 492 | foo.$00; |
493 | } | 493 | } |
494 | "#, | 494 | "#, |
495 | ); | 495 | ); |
@@ -505,7 +505,7 @@ impl Foo { | |||
505 | } //^^^^^^^^^^ | 505 | } //^^^^^^^^^^ |
506 | 506 | ||
507 | fn bar(foo: &Foo) { | 507 | fn bar(foo: &Foo) { |
508 | Foo::frobnicate<|>(); | 508 | Foo::frobnicate$0(); |
509 | } | 509 | } |
510 | "#, | 510 | "#, |
511 | ); | 511 | ); |
@@ -520,7 +520,7 @@ trait Foo { | |||
520 | } //^^^^^^^^^^ | 520 | } //^^^^^^^^^^ |
521 | 521 | ||
522 | fn bar() { | 522 | fn bar() { |
523 | Foo::frobnicate<|>(); | 523 | Foo::frobnicate$0(); |
524 | } | 524 | } |
525 | "#, | 525 | "#, |
526 | ); | 526 | ); |
@@ -537,7 +537,7 @@ trait Trait { | |||
537 | impl Trait for Foo {} | 537 | impl Trait for Foo {} |
538 | 538 | ||
539 | fn bar() { | 539 | fn bar() { |
540 | Foo::frobnicate<|>(); | 540 | Foo::frobnicate$0(); |
541 | } | 541 | } |
542 | "#, | 542 | "#, |
543 | ); | 543 | ); |
@@ -551,7 +551,7 @@ struct Foo; | |||
551 | impl Foo { | 551 | impl Foo { |
552 | //^^^ | 552 | //^^^ |
553 | pub fn new() -> Self { | 553 | pub fn new() -> Self { |
554 | Self<|> {} | 554 | Self$0 {} |
555 | } | 555 | } |
556 | } | 556 | } |
557 | "#, | 557 | "#, |
@@ -561,7 +561,7 @@ impl Foo { | |||
561 | struct Foo; | 561 | struct Foo; |
562 | impl Foo { | 562 | impl Foo { |
563 | //^^^ | 563 | //^^^ |
564 | pub fn new() -> Self<|> { | 564 | pub fn new() -> Self$0 { |
565 | Self {} | 565 | Self {} |
566 | } | 566 | } |
567 | } | 567 | } |
@@ -573,7 +573,7 @@ impl Foo { | |||
573 | enum Foo { A } | 573 | enum Foo { A } |
574 | impl Foo { | 574 | impl Foo { |
575 | //^^^ | 575 | //^^^ |
576 | pub fn new() -> Self<|> { | 576 | pub fn new() -> Self$0 { |
577 | Foo::A | 577 | Foo::A |
578 | } | 578 | } |
579 | } | 579 | } |
@@ -585,7 +585,7 @@ impl Foo { | |||
585 | enum Foo { A } | 585 | enum Foo { A } |
586 | impl Foo { | 586 | impl Foo { |
587 | //^^^ | 587 | //^^^ |
588 | pub fn thing(a: &Self<|>) { | 588 | pub fn thing(a: &Self$0) { |
589 | } | 589 | } |
590 | } | 590 | } |
591 | "#, | 591 | "#, |
@@ -603,7 +603,7 @@ trait Make { | |||
603 | impl Make for Foo { | 603 | impl Make for Foo { |
604 | //^^^ | 604 | //^^^ |
605 | fn new() -> Self { | 605 | fn new() -> Self { |
606 | Self<|> {} | 606 | Self$0 {} |
607 | } | 607 | } |
608 | } | 608 | } |
609 | "#, | 609 | "#, |
@@ -617,7 +617,7 @@ trait Make { | |||
617 | } | 617 | } |
618 | impl Make for Foo { | 618 | impl Make for Foo { |
619 | //^^^ | 619 | //^^^ |
620 | fn new() -> Self<|> { | 620 | fn new() -> Self$0 { |
621 | Self {} | 621 | Self {} |
622 | } | 622 | } |
623 | } | 623 | } |
@@ -629,7 +629,7 @@ impl Make for Foo { | |||
629 | fn goto_def_when_used_on_definition_name_itself() { | 629 | fn goto_def_when_used_on_definition_name_itself() { |
630 | check( | 630 | check( |
631 | r#" | 631 | r#" |
632 | struct Foo<|> { value: u32 } | 632 | struct Foo$0 { value: u32 } |
633 | //^^^ | 633 | //^^^ |
634 | "#, | 634 | "#, |
635 | ); | 635 | ); |
@@ -637,21 +637,21 @@ struct Foo<|> { value: u32 } | |||
637 | check( | 637 | check( |
638 | r#" | 638 | r#" |
639 | struct Foo { | 639 | struct Foo { |
640 | field<|>: string, | 640 | field$0: string, |
641 | } //^^^^^ | 641 | } //^^^^^ |
642 | "#, | 642 | "#, |
643 | ); | 643 | ); |
644 | 644 | ||
645 | check( | 645 | check( |
646 | r#" | 646 | r#" |
647 | fn foo_test<|>() { } | 647 | fn foo_test$0() { } |
648 | //^^^^^^^^ | 648 | //^^^^^^^^ |
649 | "#, | 649 | "#, |
650 | ); | 650 | ); |
651 | 651 | ||
652 | check( | 652 | check( |
653 | r#" | 653 | r#" |
654 | enum Foo<|> { Variant } | 654 | enum Foo$0 { Variant } |
655 | //^^^ | 655 | //^^^ |
656 | "#, | 656 | "#, |
657 | ); | 657 | ); |
@@ -660,7 +660,7 @@ enum Foo<|> { Variant } | |||
660 | r#" | 660 | r#" |
661 | enum Foo { | 661 | enum Foo { |
662 | Variant1, | 662 | Variant1, |
663 | Variant2<|>, | 663 | Variant2$0, |
664 | //^^^^^^^^ | 664 | //^^^^^^^^ |
665 | Variant3, | 665 | Variant3, |
666 | } | 666 | } |
@@ -669,35 +669,35 @@ enum Foo { | |||
669 | 669 | ||
670 | check( | 670 | check( |
671 | r#" | 671 | r#" |
672 | static INNER<|>: &str = ""; | 672 | static INNER$0: &str = ""; |
673 | //^^^^^ | 673 | //^^^^^ |
674 | "#, | 674 | "#, |
675 | ); | 675 | ); |
676 | 676 | ||
677 | check( | 677 | check( |
678 | r#" | 678 | r#" |
679 | const INNER<|>: &str = ""; | 679 | const INNER$0: &str = ""; |
680 | //^^^^^ | 680 | //^^^^^ |
681 | "#, | 681 | "#, |
682 | ); | 682 | ); |
683 | 683 | ||
684 | check( | 684 | check( |
685 | r#" | 685 | r#" |
686 | type Thing<|> = Option<()>; | 686 | type Thing$0 = Option<()>; |
687 | //^^^^^ | 687 | //^^^^^ |
688 | "#, | 688 | "#, |
689 | ); | 689 | ); |
690 | 690 | ||
691 | check( | 691 | check( |
692 | r#" | 692 | r#" |
693 | trait Foo<|> { } | 693 | trait Foo$0 { } |
694 | //^^^ | 694 | //^^^ |
695 | "#, | 695 | "#, |
696 | ); | 696 | ); |
697 | 697 | ||
698 | check( | 698 | check( |
699 | r#" | 699 | r#" |
700 | mod bar<|> { } | 700 | mod bar$0 { } |
701 | //^^^ | 701 | //^^^ |
702 | "#, | 702 | "#, |
703 | ); | 703 | ); |
@@ -714,7 +714,7 @@ fn foo() {} | |||
714 | //^^^ | 714 | //^^^ |
715 | id! { | 715 | id! { |
716 | fn bar() { | 716 | fn bar() { |
717 | fo<|>o(); | 717 | fo$0o(); |
718 | } | 718 | } |
719 | } | 719 | } |
720 | mod confuse_index { fn foo(); } | 720 | mod confuse_index { fn foo(); } |
@@ -743,7 +743,7 @@ pub mod __export { | |||
743 | fn foo() -> i8 {} | 743 | fn foo() -> i8 {} |
744 | //^^^ | 744 | //^^^ |
745 | fn test() { | 745 | fn test() { |
746 | format!("{}", fo<|>o()) | 746 | format!("{}", fo$0o()) |
747 | } | 747 | } |
748 | "#, | 748 | "#, |
749 | ); | 749 | ); |
@@ -761,7 +761,7 @@ macro_rules! include {} | |||
761 | //^^^^^^^^^^^^^^^^^^^ | 761 | //^^^^^^^^^^^^^^^^^^^ |
762 | 762 | ||
763 | fn f() { | 763 | fn f() { |
764 | foo<|>(); | 764 | foo$0(); |
765 | } | 765 | } |
766 | 766 | ||
767 | mod confuse_index { | 767 | mod confuse_index { |
@@ -778,7 +778,7 @@ fn foo() {} | |||
778 | fn goto_for_type_param() { | 778 | fn goto_for_type_param() { |
779 | check( | 779 | check( |
780 | r#" | 780 | r#" |
781 | struct Foo<T: Clone> { t: <|>T } | 781 | struct Foo<T: Clone> { t: $0T } |
782 | //^ | 782 | //^ |
783 | "#, | 783 | "#, |
784 | ); | 784 | ); |
@@ -796,7 +796,7 @@ fn foo() { | |||
796 | let x = 1; | 796 | let x = 1; |
797 | //^ | 797 | //^ |
798 | id!({ | 798 | id!({ |
799 | let y = <|>x; | 799 | let y = $0x; |
800 | let z = y; | 800 | let z = y; |
801 | }); | 801 | }); |
802 | } | 802 | } |
@@ -814,7 +814,7 @@ fn foo() { | |||
814 | id!({ | 814 | id!({ |
815 | let y = x; | 815 | let y = x; |
816 | //^ | 816 | //^ |
817 | let z = <|>y; | 817 | let z = $0y; |
818 | }); | 818 | }); |
819 | } | 819 | } |
820 | "#, | 820 | "#, |
@@ -829,7 +829,7 @@ fn main() { | |||
829 | fn foo() { | 829 | fn foo() { |
830 | let x = 92; | 830 | let x = 92; |
831 | //^ | 831 | //^ |
832 | <|>x; | 832 | $0x; |
833 | } | 833 | } |
834 | } | 834 | } |
835 | "#, | 835 | "#, |
@@ -843,7 +843,7 @@ fn main() { | |||
843 | fn bar() { | 843 | fn bar() { |
844 | macro_rules! foo { () => { () } } | 844 | macro_rules! foo { () => { () } } |
845 | //^^^ | 845 | //^^^ |
846 | <|>foo!(); | 846 | $0foo!(); |
847 | } | 847 | } |
848 | "#, | 848 | "#, |
849 | ); | 849 | ); |
@@ -857,7 +857,7 @@ struct Foo { x: i32 } | |||
857 | fn main() { | 857 | fn main() { |
858 | let x = 92; | 858 | let x = 92; |
859 | //^ | 859 | //^ |
860 | Foo { x<|> }; | 860 | Foo { x$0 }; |
861 | } | 861 | } |
862 | "#, | 862 | "#, |
863 | ) | 863 | ) |
@@ -872,7 +872,7 @@ enum Foo { | |||
872 | } //^ | 872 | } //^ |
873 | fn baz(foo: Foo) { | 873 | fn baz(foo: Foo) { |
874 | match foo { | 874 | match foo { |
875 | Foo::Bar { x<|> } => x | 875 | Foo::Bar { x$0 } => x |
876 | }; | 876 | }; |
877 | } | 877 | } |
878 | "#, | 878 | "#, |
@@ -887,7 +887,7 @@ enum Foo { Bar } | |||
887 | //^^^ | 887 | //^^^ |
888 | impl Foo { | 888 | impl Foo { |
889 | fn baz(self) { | 889 | fn baz(self) { |
890 | match self { Self::Bar<|> => {} } | 890 | match self { Self::Bar$0 => {} } |
891 | } | 891 | } |
892 | } | 892 | } |
893 | "#, | 893 | "#, |
@@ -902,7 +902,7 @@ enum Foo { Bar { val: i32 } } | |||
902 | //^^^ | 902 | //^^^ |
903 | impl Foo { | 903 | impl Foo { |
904 | fn baz(self) -> i32 { | 904 | fn baz(self) -> i32 { |
905 | match self { Self::Bar<|> { val } => {} } | 905 | match self { Self::Bar$0 { val } => {} } |
906 | } | 906 | } |
907 | } | 907 | } |
908 | "#, | 908 | "#, |
@@ -916,7 +916,7 @@ impl Foo { | |||
916 | enum Foo { Bar } | 916 | enum Foo { Bar } |
917 | //^^^ | 917 | //^^^ |
918 | impl Foo { | 918 | impl Foo { |
919 | fn baz(self) { Self::Bar<|>; } | 919 | fn baz(self) { Self::Bar$0; } |
920 | } | 920 | } |
921 | "#, | 921 | "#, |
922 | ); | 922 | ); |
@@ -929,7 +929,7 @@ impl Foo { | |||
929 | enum Foo { Bar { val: i32 } } | 929 | enum Foo { Bar { val: i32 } } |
930 | //^^^ | 930 | //^^^ |
931 | impl Foo { | 931 | impl Foo { |
932 | fn baz(self) { Self::Bar<|> {val: 4}; } | 932 | fn baz(self) { Self::Bar$0 {val: 4}; } |
933 | } | 933 | } |
934 | "#, | 934 | "#, |
935 | ); | 935 | ); |
@@ -939,7 +939,7 @@ impl Foo { | |||
939 | fn goto_def_for_type_alias_generic_parameter() { | 939 | fn goto_def_for_type_alias_generic_parameter() { |
940 | check( | 940 | check( |
941 | r#" | 941 | r#" |
942 | type Alias<T> = T<|>; | 942 | type Alias<T> = T$0; |
943 | //^ | 943 | //^ |
944 | "#, | 944 | "#, |
945 | ) | 945 | ) |
@@ -950,7 +950,7 @@ type Alias<T> = T<|>; | |||
950 | check( | 950 | check( |
951 | r#" | 951 | r#" |
952 | //- /lib.rs | 952 | //- /lib.rs |
953 | foo::module<|>::mac!(); | 953 | foo::module$0::mac!(); |
954 | 954 | ||
955 | //- /foo/lib.rs | 955 | //- /foo/lib.rs |
956 | pub mod module { | 956 | pub mod module { |
@@ -972,7 +972,7 @@ trait Iterator { | |||
972 | //^^^^ | 972 | //^^^^ |
973 | } | 973 | } |
974 | 974 | ||
975 | fn f() -> impl Iterator<Item<|> = u8> {} | 975 | fn f() -> impl Iterator<Item$0 = u8> {} |
976 | "#, | 976 | "#, |
977 | ); | 977 | ); |
978 | } | 978 | } |
@@ -987,7 +987,7 @@ trait Iterator { | |||
987 | type B; | 987 | type B; |
988 | } | 988 | } |
989 | 989 | ||
990 | fn f() -> impl Iterator<A<|> = u8, B = ()> {} | 990 | fn f() -> impl Iterator<A$0 = u8, B = ()> {} |
991 | "#, | 991 | "#, |
992 | ); | 992 | ); |
993 | check( | 993 | check( |
@@ -998,7 +998,7 @@ trait Iterator { | |||
998 | //^ | 998 | //^ |
999 | } | 999 | } |
1000 | 1000 | ||
1001 | fn f() -> impl Iterator<A = u8, B<|> = ()> {} | 1001 | fn f() -> impl Iterator<A = u8, B$0 = ()> {} |
1002 | "#, | 1002 | "#, |
1003 | ); | 1003 | ); |
1004 | } | 1004 | } |
@@ -1012,7 +1012,7 @@ trait Iterator { | |||
1012 | //^^^^ | 1012 | //^^^^ |
1013 | } | 1013 | } |
1014 | 1014 | ||
1015 | fn g() -> <() as Iterator<Item<|> = ()>>::Item {} | 1015 | fn g() -> <() as Iterator<Item$0 = ()>>::Item {} |
1016 | "#, | 1016 | "#, |
1017 | ); | 1017 | ); |
1018 | } | 1018 | } |
@@ -1027,7 +1027,7 @@ trait Iterator { | |||
1027 | type B; | 1027 | type B; |
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | fn g() -> <() as Iterator<A<|> = (), B = u8>>::B {} | 1030 | fn g() -> <() as Iterator<A$0 = (), B = u8>>::B {} |
1031 | "#, | 1031 | "#, |
1032 | ); | 1032 | ); |
1033 | check( | 1033 | check( |
@@ -1038,7 +1038,7 @@ trait Iterator { | |||
1038 | //^ | 1038 | //^ |
1039 | } | 1039 | } |
1040 | 1040 | ||
1041 | fn g() -> <() as Iterator<A = (), B<|> = u8>>::A {} | 1041 | fn g() -> <() as Iterator<A = (), B$0 = u8>>::A {} |
1042 | "#, | 1042 | "#, |
1043 | ); | 1043 | ); |
1044 | } | 1044 | } |
@@ -1052,7 +1052,7 @@ struct Foo {} | |||
1052 | impl Foo { | 1052 | impl Foo { |
1053 | fn bar(self: &Foo) { | 1053 | fn bar(self: &Foo) { |
1054 | //^^^^ | 1054 | //^^^^ |
1055 | let foo = sel<|>f; | 1055 | let foo = sel$0f; |
1056 | } | 1056 | } |
1057 | }"#, | 1057 | }"#, |
1058 | ) | 1058 | ) |
@@ -1065,7 +1065,7 @@ impl Foo { | |||
1065 | struct Foo {} | 1065 | struct Foo {} |
1066 | 1066 | ||
1067 | impl Foo { | 1067 | impl Foo { |
1068 | fn bar(&self<|>) { | 1068 | fn bar(&self$0) { |
1069 | //^^^^ | 1069 | //^^^^ |
1070 | } | 1070 | } |
1071 | }"#, | 1071 | }"#, |
@@ -1076,7 +1076,7 @@ impl Foo { | |||
1076 | fn goto_lifetime_param_on_decl() { | 1076 | fn goto_lifetime_param_on_decl() { |
1077 | check( | 1077 | check( |
1078 | r#" | 1078 | r#" |
1079 | fn foo<'foobar<|>>(_: &'foobar ()) { | 1079 | fn foo<'foobar$0>(_: &'foobar ()) { |
1080 | //^^^^^^^ | 1080 | //^^^^^^^ |
1081 | }"#, | 1081 | }"#, |
1082 | ) | 1082 | ) |
@@ -1086,7 +1086,7 @@ fn foo<'foobar<|>>(_: &'foobar ()) { | |||
1086 | fn goto_lifetime_param_decl() { | 1086 | fn goto_lifetime_param_decl() { |
1087 | check( | 1087 | check( |
1088 | r#" | 1088 | r#" |
1089 | fn foo<'foobar>(_: &'foobar<|> ()) { | 1089 | fn foo<'foobar>(_: &'foobar$0 ()) { |
1090 | //^^^^^^^ | 1090 | //^^^^^^^ |
1091 | }"#, | 1091 | }"#, |
1092 | ) | 1092 | ) |
@@ -1097,7 +1097,7 @@ fn foo<'foobar>(_: &'foobar<|> ()) { | |||
1097 | check( | 1097 | check( |
1098 | r#" | 1098 | r#" |
1099 | fn foo<'foobar>(_: &'foobar ()) { | 1099 | fn foo<'foobar>(_: &'foobar ()) { |
1100 | fn foo<'foobar>(_: &'foobar<|> ()) {} | 1100 | fn foo<'foobar>(_: &'foobar$0 ()) {} |
1101 | //^^^^^^^ | 1101 | //^^^^^^^ |
1102 | }"#, | 1102 | }"#, |
1103 | ) | 1103 | ) |
@@ -1108,13 +1108,13 @@ fn foo<'foobar>(_: &'foobar ()) { | |||
1108 | fn goto_lifetime_hrtb() { | 1108 | fn goto_lifetime_hrtb() { |
1109 | check( | 1109 | check( |
1110 | r#"trait Foo<T> {} | 1110 | r#"trait Foo<T> {} |
1111 | fn foo<T>() where for<'a> T: Foo<&'a<|> (u8, u16)>, {} | 1111 | fn foo<T>() where for<'a> T: Foo<&'a$0 (u8, u16)>, {} |
1112 | //^^ | 1112 | //^^ |
1113 | "#, | 1113 | "#, |
1114 | ); | 1114 | ); |
1115 | check( | 1115 | check( |
1116 | r#"trait Foo<T> {} | 1116 | r#"trait Foo<T> {} |
1117 | fn foo<T>() where for<'a<|>> T: Foo<&'a (u8, u16)>, {} | 1117 | fn foo<T>() where for<'a$0> T: Foo<&'a (u8, u16)>, {} |
1118 | //^^ | 1118 | //^^ |
1119 | "#, | 1119 | "#, |
1120 | ); | 1120 | ); |
@@ -1125,7 +1125,7 @@ fn foo<T>() where for<'a<|>> T: Foo<&'a (u8, u16)>, {} | |||
1125 | fn goto_lifetime_hrtb_for_type() { | 1125 | fn goto_lifetime_hrtb_for_type() { |
1126 | check( | 1126 | check( |
1127 | r#"trait Foo<T> {} | 1127 | r#"trait Foo<T> {} |
1128 | fn foo<T>() where T: for<'a> Foo<&'a<|> (u8, u16)>, {} | 1128 | fn foo<T>() where T: for<'a> Foo<&'a$0 (u8, u16)>, {} |
1129 | //^^ | 1129 | //^^ |
1130 | "#, | 1130 | "#, |
1131 | ); | 1131 | ); |
@@ -1139,7 +1139,7 @@ fn foo<'foo>(_: &'foo ()) { | |||
1139 | 'foo: { | 1139 | 'foo: { |
1140 | //^^^^ | 1140 | //^^^^ |
1141 | 'bar: loop { | 1141 | 'bar: loop { |
1142 | break 'foo<|>; | 1142 | break 'foo$0; |
1143 | } | 1143 | } |
1144 | } | 1144 | } |
1145 | }"#, | 1145 | }"#, |