diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-06 11:56:59 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-06 11:56:59 +0100 |
commit | a609336d7287b3ddddbde30b1f0fb606bf149baf (patch) | |
tree | 343d39c2a01bd3643bcab13eb01dfbd4f6a511cc /crates/ra_hir_ty/src/tests/traits.rs | |
parent | 02f7b5d7abbab829c2a0f66cdcbb6678afb412a4 (diff) | |
parent | a4a4a1854ebb53e1cdd7a5e3b308112bbbf3c676 (diff) |
Merge #4765
4765: Fix type parameter defaults r=matklad a=flodiebold
They should not be applied in expression or pattern contexts, unless there are other explicitly given type args.
(The existing tests about this were actually wrong.)
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty/src/tests/traits.rs')
-rw-r--r-- | crates/ra_hir_ty/src/tests/traits.rs | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/crates/ra_hir_ty/src/tests/traits.rs b/crates/ra_hir_ty/src/tests/traits.rs index 0c538a62d..133fb5f39 100644 --- a/crates/ra_hir_ty/src/tests/traits.rs +++ b/crates/ra_hir_ty/src/tests/traits.rs | |||
@@ -1806,33 +1806,33 @@ fn test() { | |||
1806 | } | 1806 | } |
1807 | "#), | 1807 | "#), |
1808 | @r###" | 1808 | @r###" |
1809 | 65..69 'self': &Self | 1809 | 65..69 'self': &Self |
1810 | 166..170 'self': Self | 1810 | 166..170 'self': Self |
1811 | 172..176 'args': Args | 1811 | 172..176 'args': Args |
1812 | 240..244 'self': &Foo | 1812 | 240..244 'self': &Foo |
1813 | 255..257 '{}': () | 1813 | 255..257 '{}': () |
1814 | 335..336 'f': F | 1814 | 335..336 'f': F |
1815 | 355..357 '{}': () | 1815 | 355..357 '{}': () |
1816 | 444..690 '{ ...o(); }': () | 1816 | 444..690 '{ ...o(); }': () |
1817 | 454..459 'lazy1': Lazy<Foo, fn() -> T> | 1817 | 454..459 'lazy1': Lazy<Foo, || -> Foo> |
1818 | 476..485 'Lazy::new': fn new<Foo, fn() -> T>(fn() -> T) -> Lazy<Foo, fn() -> T> | 1818 | 476..485 'Lazy::new': fn new<Foo, || -> Foo>(|| -> Foo) -> Lazy<Foo, || -> Foo> |
1819 | 476..493 'Lazy::...| Foo)': Lazy<Foo, fn() -> T> | 1819 | 476..493 'Lazy::...| Foo)': Lazy<Foo, || -> Foo> |
1820 | 486..492 '|| Foo': || -> T | 1820 | 486..492 '|| Foo': || -> Foo |
1821 | 489..492 'Foo': Foo | 1821 | 489..492 'Foo': Foo |
1822 | 503..505 'r1': {unknown} | 1822 | 503..505 'r1': usize |
1823 | 508..513 'lazy1': Lazy<Foo, fn() -> T> | 1823 | 508..513 'lazy1': Lazy<Foo, || -> Foo> |
1824 | 508..519 'lazy1.foo()': {unknown} | 1824 | 508..519 'lazy1.foo()': usize |
1825 | 561..576 'make_foo_fn_ptr': fn() -> Foo | 1825 | 561..576 'make_foo_fn_ptr': fn() -> Foo |
1826 | 592..603 'make_foo_fn': fn make_foo_fn() -> Foo | 1826 | 592..603 'make_foo_fn': fn make_foo_fn() -> Foo |
1827 | 613..618 'lazy2': Lazy<Foo, fn() -> T> | 1827 | 613..618 'lazy2': Lazy<Foo, fn() -> Foo> |
1828 | 635..644 'Lazy::new': fn new<Foo, fn() -> T>(fn() -> T) -> Lazy<Foo, fn() -> T> | 1828 | 635..644 'Lazy::new': fn new<Foo, fn() -> Foo>(fn() -> Foo) -> Lazy<Foo, fn() -> Foo> |
1829 | 635..661 'Lazy::...n_ptr)': Lazy<Foo, fn() -> T> | 1829 | 635..661 'Lazy::...n_ptr)': Lazy<Foo, fn() -> Foo> |
1830 | 645..660 'make_foo_fn_ptr': fn() -> Foo | 1830 | 645..660 'make_foo_fn_ptr': fn() -> Foo |
1831 | 671..673 'r2': {unknown} | 1831 | 671..673 'r2': {unknown} |
1832 | 676..681 'lazy2': Lazy<Foo, fn() -> T> | 1832 | 676..681 'lazy2': Lazy<Foo, fn() -> Foo> |
1833 | 676..687 'lazy2.foo()': {unknown} | 1833 | 676..687 'lazy2.foo()': {unknown} |
1834 | 550..552 '{}': () | 1834 | 550..552 '{}': () |
1835 | "### | 1835 | "### |
1836 | ); | 1836 | ); |
1837 | } | 1837 | } |
1838 | 1838 | ||