diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-09 21:21:27 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-09 21:21:27 +0100 |
commit | 5fbdf57c4fe7ee99ba94549766a2644431f61b26 (patch) | |
tree | 97eb439759494abecc9587a0473b9dc2e39b3a5b /crates/ra_hir/src/ty/tests.rs | |
parent | 8316193647f256d3e623d3a86a503298aab91b8f (diff) | |
parent | 85fdf57dbd2cacba6320b55ef1cd57f7795c8ea5 (diff) |
Merge #1800
1800: make all traits non-enumerable r=flodiebold a=nikomatsakis
As discussed on Zulip, this actually matches the present behavior of rustc.
r? @flodiebold
Co-authored-by: Niko Matsakis <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/tests.rs')
-rw-r--r-- | crates/ra_hir/src/ty/tests.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs index 25716fe8c..2c7d94bce 100644 --- a/crates/ra_hir/src/ty/tests.rs +++ b/crates/ra_hir/src/ty/tests.rs | |||
@@ -3007,7 +3007,7 @@ impl<T, U> Into<U> for T where U: From<T> {} | |||
3007 | fn test() { S2.into()<|>; } | 3007 | fn test() { S2.into()<|>; } |
3008 | "#, | 3008 | "#, |
3009 | ); | 3009 | ); |
3010 | assert_eq!(t, "S1"); | 3010 | assert_eq!(t, "{unknown}"); |
3011 | } | 3011 | } |
3012 | 3012 | ||
3013 | #[test] | 3013 | #[test] |
@@ -3024,7 +3024,7 @@ impl<T, U: From<T>> Into<U> for T {} | |||
3024 | fn test() { S2.into()<|>; } | 3024 | fn test() { S2.into()<|>; } |
3025 | "#, | 3025 | "#, |
3026 | ); | 3026 | ); |
3027 | assert_eq!(t, "S1"); | 3027 | assert_eq!(t, "{unknown}"); |
3028 | } | 3028 | } |
3029 | 3029 | ||
3030 | #[test] | 3030 | #[test] |
@@ -3066,7 +3066,7 @@ impl<B, C> Trait for S<B, C> where C: FnX, B: SendX {} | |||
3066 | fn test() { (S {}).method()<|>; } | 3066 | fn test() { (S {}).method()<|>; } |
3067 | "#, | 3067 | "#, |
3068 | ); | 3068 | ); |
3069 | assert_eq!(t, "{unknown}"); | 3069 | assert_eq!(t, "()"); |
3070 | } | 3070 | } |
3071 | 3071 | ||
3072 | #[test] | 3072 | #[test] |
@@ -3546,11 +3546,11 @@ fn test(x: Trait, y: &Trait) -> u64 { | |||
3546 | [129; 132) 'bar': fn bar() -> {unknown} | 3546 | [129; 132) 'bar': fn bar() -> {unknown} |
3547 | [129; 134) 'bar()': {unknown} | 3547 | [129; 134) 'bar()': {unknown} |
3548 | [140; 141) 'x': {unknown} | 3548 | [140; 141) 'x': {unknown} |
3549 | [140; 147) 'x.foo()': {unknown} | 3549 | [140; 147) 'x.foo()': u64 |
3550 | [153; 154) 'y': &{unknown} | 3550 | [153; 154) 'y': &{unknown} |
3551 | [153; 160) 'y.foo()': {unknown} | 3551 | [153; 160) 'y.foo()': u64 |
3552 | [166; 167) 'z': {unknown} | 3552 | [166; 167) 'z': {unknown} |
3553 | [166; 173) 'z.foo()': {unknown} | 3553 | [166; 173) 'z.foo()': u64 |
3554 | "### | 3554 | "### |
3555 | ); | 3555 | ); |
3556 | } | 3556 | } |