From 4789a993eb26963a2411dcc3041733a3b034634a Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Tue, 28 Jan 2020 21:42:58 +0100 Subject: Fix printing of function types --- crates/ra_hir_ty/src/tests/method_resolution.rs | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'crates/ra_hir_ty/src/tests/method_resolution.rs') diff --git a/crates/ra_hir_ty/src/tests/method_resolution.rs b/crates/ra_hir_ty/src/tests/method_resolution.rs index ce9a06fde..6c7f6706a 100644 --- a/crates/ra_hir_ty/src/tests/method_resolution.rs +++ b/crates/ra_hir_ty/src/tests/method_resolution.rs @@ -27,7 +27,7 @@ fn test() { [66; 73) 'loop {}': ! [71; 73) '{}': () [133; 160) '{ ...o"); }': () - [139; 149) '<[_]>::foo': fn foo(&[T]) -> T + [139; 149) '<[_]>::foo': fn foo(&[u8]) -> u8 [139; 157) '<[_]>:..."foo")': u8 [150; 156) 'b"foo"': &[u8] "### @@ -175,7 +175,7 @@ fn test() { [98; 101) 'val': T [123; 155) '{ ...32); }': () [133; 134) 'a': Gen - [137; 146) 'Gen::make': fn make(T) -> Gen + [137; 146) 'Gen::make': fn make(u32) -> Gen [137; 152) 'Gen::make(0u32)': Gen [147; 151) '0u32': u32 "### @@ -206,7 +206,7 @@ fn test() { [95; 98) '{ }': () [118; 146) '{ ...e(); }': () [128; 129) 'a': Gen - [132; 141) 'Gen::make': fn make() -> Gen + [132; 141) 'Gen::make': fn make() -> Gen [132; 143) 'Gen::make()': Gen "### ); @@ -260,7 +260,7 @@ fn test() { [91; 94) '{ }': () [114; 149) '{ ...e(); }': () [124; 125) 'a': Gen - [128; 144) 'Gen::<...::make': fn make() -> Gen + [128; 144) 'Gen::<...::make': fn make() -> Gen [128; 146) 'Gen::<...make()': Gen "### ); @@ -291,7 +291,7 @@ fn test() { [117; 120) '{ }': () [140; 180) '{ ...e(); }': () [150; 151) 'a': Gen - [154; 175) 'Gen::<...::make': fn make() -> Gen + [154; 175) 'Gen::<...::make': fn make() -> Gen [154; 177) 'Gen::<...make()': Gen "### ); @@ -475,7 +475,7 @@ fn test() { @r###" [33; 37) 'self': &Self [102; 127) '{ ...d(); }': () - [108; 109) 'S': S(T) -> S + [108; 109) 'S': S(u32) -> S [108; 115) 'S(1u32)': S [108; 124) 'S(1u32...thod()': u32 [110; 114) '1u32': u32 @@ -501,13 +501,13 @@ fn test() { @r###" [87; 193) '{ ...t(); }': () [97; 99) 's1': S - [105; 121) 'Defaul...efault': fn default() -> Self + [105; 121) 'Defaul...efault': fn default() -> S [105; 123) 'Defaul...ault()': S [133; 135) 's2': S - [138; 148) 'S::default': fn default() -> Self + [138; 148) 'S::default': fn default() -> S [138; 150) 'S::default()': S [160; 162) 's3': S - [165; 188) '() -> Self + [165; 188) '() -> S [165; 190) '() -> T + [141; 148) 'S::make': fn make() -> u32 [141; 150) 'S::make()': u32 [160; 161) 'b': u64 - [164; 178) 'G::::make': fn make, u64>() -> T + [164; 178) 'G::::make': fn make, u64>() -> u64 [164; 180) 'G::, f64>() -> T + [199; 206) 'G::make': fn make, f64>() -> f64 [199; 208) 'G::make()': f64 "### ); @@ -567,19 +567,19 @@ fn test() { @r###" [135; 313) '{ ...e(); }': () [145; 146) 'a': (u32, i64) - [149; 163) 'S::make::': fn make() -> (T, U) + [149; 163) 'S::make::': fn make() -> (u32, i64) [149; 165) 'S::mak...i64>()': (u32, i64) [175; 176) 'b': (u32, i64) - [189; 196) 'S::make': fn make() -> (T, U) + [189; 196) 'S::make': fn make() -> (u32, i64) [189; 198) 'S::make()': (u32, i64) [208; 209) 'c': (u32, i64) - [212; 233) 'G::': fn make, u32, i64>() -> (T, U) + [212; 233) 'G::': fn make, u32, i64>() -> (u32, i64) [212; 235) 'G::()': (u32, i64) [245; 246) 'd': (u32, i64) - [259; 273) 'G::make::': fn make, u32, i64>() -> (T, U) + [259; 273) 'G::make::': fn make, u32, i64>() -> (u32, i64) [259; 275) 'G::mak...i64>()': (u32, i64) [285; 286) 'e': (u32, i64) - [301; 308) 'G::make': fn make, u32, i64>() -> (T, U) + [301; 308) 'G::make': fn make, u32, i64>() -> (u32, i64) [301; 310) 'G::make()': (u32, i64) "### ); @@ -601,7 +601,7 @@ fn test() { @r###" [101; 127) '{ ...e(); }': () [111; 112) 'a': (S, i64) - [115; 122) 'S::make': fn make, i64>() -> (Self, T) + [115; 122) 'S::make': fn make, i64>() -> (S, i64) [115; 124) 'S::make()': (S, i64) "### ); @@ -625,10 +625,10 @@ fn test() { @r###" [131; 203) '{ ...e(); }': () [141; 142) 'a': (S, i64) - [158; 165) 'S::make': fn make, i64>() -> (Self, T) + [158; 165) 'S::make': fn make, i64>() -> (S, i64) [158; 167) 'S::make()': (S, i64) [177; 178) 'b': (S, i32) - [191; 198) 'S::make': fn make, i32>() -> (Self, T) + [191; 198) 'S::make': fn make, i32>() -> (S, i32) [191; 200) 'S::make()': (S, i32) "### ); @@ -728,7 +728,7 @@ fn test() { [157; 158) 'S': S [157; 165) 'S.into()': u64 [175; 176) 'z': u64 - [179; 196) 'Into::...::into': fn into(Self) -> T + [179; 196) 'Into::...::into': fn into(S) -> u64 [179; 199) 'Into::...nto(S)': u64 [197; 198) 'S': S "### -- cgit v1.2.3 From 4a8279a21ad75ae2cb6d96746b8a880038ec0455 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Fri, 31 Jan 2020 15:34:43 +0100 Subject: Fix another test --- crates/ra_hir_ty/src/tests/method_resolution.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/ra_hir_ty/src/tests/method_resolution.rs') diff --git a/crates/ra_hir_ty/src/tests/method_resolution.rs b/crates/ra_hir_ty/src/tests/method_resolution.rs index 6c7f6706a..446d12813 100644 --- a/crates/ra_hir_ty/src/tests/method_resolution.rs +++ b/crates/ra_hir_ty/src/tests/method_resolution.rs @@ -651,10 +651,10 @@ fn test() { @r###" [107; 211) '{ ...>(); }': () [117; 118) 'a': (S, i64, u8) - [121; 150) '': fn make, i64, u8>() -> (Self, T, U) + [121; 150) '': fn make, i64, u8>() -> (S, i64, u8) [121; 152) '()': (S, i64, u8) [162; 163) 'b': (S, i64, u8) - [182; 206) 'Trait:...::': fn make, i64, u8>() -> (Self, T, U) + [182; 206) 'Trait:...::': fn make, i64, u8>() -> (S, i64, u8) [182; 208) 'Trait:...()': (S, i64, u8) "### ); -- cgit v1.2.3 From ed25cf70d5e0df9c7a33deb503ea14c2d97bd7a7 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Fri, 31 Jan 2020 16:52:43 +0100 Subject: Change Ty::Param to contain param ID --- crates/ra_hir_ty/src/tests/method_resolution.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crates/ra_hir_ty/src/tests/method_resolution.rs') diff --git a/crates/ra_hir_ty/src/tests/method_resolution.rs b/crates/ra_hir_ty/src/tests/method_resolution.rs index 446d12813..1722563aa 100644 --- a/crates/ra_hir_ty/src/tests/method_resolution.rs +++ b/crates/ra_hir_ty/src/tests/method_resolution.rs @@ -697,7 +697,7 @@ fn test>(t: T) { [71; 72) 't': T [77; 96) '{ ...d(); }': () [83; 84) 't': T - [83; 93) 't.method()': [missing name] + [83; 93) 't.method()': U "### ); } -- cgit v1.2.3