diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-25 21:23:09 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-25 21:23:09 +0100 |
commit | 0d277faf6c4052dcc80037fc43b4986980d0814b (patch) | |
tree | 807f32992732a74c591f6a8c85aff354ebea09c6 /crates/ra_hir/src/ty/tests.rs | |
parent | 5704485063bad82e651c8e68f4fa2d333bfdf152 (diff) | |
parent | c35ef5013c3223986ae5111a3720ef8e85c80efc (diff) |
Merge #1914
1914: Resolve trait associated items r=matklad a=flodiebold
E.g. `Default::default` or `<Foo as Default>::default`.
Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/tests.rs')
-rw-r--r-- | crates/ra_hir/src/ty/tests.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs index 2872cd27b..f4f63ca93 100644 --- a/crates/ra_hir/src/ty/tests.rs +++ b/crates/ra_hir/src/ty/tests.rs | |||
@@ -2535,17 +2535,16 @@ fn test() { | |||
2535 | } | 2535 | } |
2536 | "#), | 2536 | "#), |
2537 | @r###" | 2537 | @r###" |
2538 | |||
2539 | [87; 193) '{ ...t(); }': () | 2538 | [87; 193) '{ ...t(); }': () |
2540 | [97; 99) 's1': S | 2539 | [97; 99) 's1': S |
2541 | [105; 121) 'Defaul...efault': {unknown} | 2540 | [105; 121) 'Defaul...efault': fn default<S>() -> Self |
2542 | [105; 123) 'Defaul...ault()': S | 2541 | [105; 123) 'Defaul...ault()': S |
2543 | [133; 135) 's2': {unknown} | 2542 | [133; 135) 's2': {unknown} |
2544 | [138; 148) 'S::default': {unknown} | 2543 | [138; 148) 'S::default': {unknown} |
2545 | [138; 150) 'S::default()': {unknown} | 2544 | [138; 150) 'S::default()': {unknown} |
2546 | [160; 162) 's3': {unknown} | 2545 | [160; 162) 's3': S |
2547 | [165; 188) '<S as ...efault': {unknown} | 2546 | [165; 188) '<S as ...efault': fn default<S>() -> Self |
2548 | [165; 190) '<S as ...ault()': {unknown} | 2547 | [165; 190) '<S as ...ault()': S |
2549 | "### | 2548 | "### |
2550 | ); | 2549 | ); |
2551 | } | 2550 | } |
@@ -2674,9 +2673,9 @@ fn test() { | |||
2674 | [148; 149) 'y': u64 | 2673 | [148; 149) 'y': u64 |
2675 | [157; 158) 'S': S | 2674 | [157; 158) 'S': S |
2676 | [157; 165) 'S.into()': u64 | 2675 | [157; 165) 'S.into()': u64 |
2677 | [175; 176) 'z': {unknown} | 2676 | [175; 176) 'z': u64 |
2678 | [179; 196) 'Into::...::into': {unknown} | 2677 | [179; 196) 'Into::...::into': fn into<S, u64>(Self) -> T |
2679 | [179; 199) 'Into::...nto(S)': {unknown} | 2678 | [179; 199) 'Into::...nto(S)': u64 |
2680 | [197; 198) 'S': S | 2679 | [197; 198) 'S': S |
2681 | "### | 2680 | "### |
2682 | ); | 2681 | ); |