diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/ra_hir/src/marks.rs | 1 | ||||
-rw-r--r-- | crates/ra_hir/src/ty/infer.rs | 1 | ||||
-rw-r--r-- | crates/ra_hir/src/ty/tests.rs | 24 |
3 files changed, 0 insertions, 26 deletions
diff --git a/crates/ra_hir/src/marks.rs b/crates/ra_hir/src/marks.rs index 1adf5cd53..f450aef9f 100644 --- a/crates/ra_hir/src/marks.rs +++ b/crates/ra_hir/src/marks.rs | |||
@@ -11,7 +11,6 @@ test_utils::marks!( | |||
11 | match_ergonomics_ref | 11 | match_ergonomics_ref |
12 | trait_resolution_on_fn_type | 12 | trait_resolution_on_fn_type |
13 | infer_while_let | 13 | infer_while_let |
14 | match_complex_arm_ty | ||
15 | match_first_arm_never | 14 | match_first_arm_never |
16 | match_second_arm_never | 15 | match_second_arm_never |
17 | match_all_arms_never | 16 | match_all_arms_never |
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs index d01063766..7b59ebfe7 100644 --- a/crates/ra_hir/src/ty/infer.rs +++ b/crates/ra_hir/src/ty/infer.rs | |||
@@ -1121,7 +1121,6 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
1121 | match_ty.clone() | 1121 | match_ty.clone() |
1122 | } else { | 1122 | } else { |
1123 | tested_by!(match_no_never_arms); | 1123 | tested_by!(match_no_never_arms); |
1124 | tested_by!(match_complex_arm_ty); | ||
1125 | expected.ty | 1124 | expected.ty |
1126 | } | 1125 | } |
1127 | } | 1126 | } |
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs index 94b0fe3b3..195514f10 100644 --- a/crates/ra_hir/src/ty/tests.rs +++ b/crates/ra_hir/src/ty/tests.rs | |||
@@ -3600,30 +3600,6 @@ mod branching_with_never_tests { | |||
3600 | use test_utils::covers; | 3600 | use test_utils::covers; |
3601 | 3601 | ||
3602 | #[test] | 3602 | #[test] |
3603 | fn match_complex_arm_ty() { | ||
3604 | covers!(match_complex_arm_ty); | ||
3605 | let t = type_at( | ||
3606 | r#" | ||
3607 | //- /main.rs | ||
3608 | enum Option<T> { | ||
3609 | Some(T), | ||
3610 | None | ||
3611 | } | ||
3612 | |||
3613 | fn test(a: i32) { | ||
3614 | let i = match a { | ||
3615 | 2 => Option::Some(2.0), | ||
3616 | _ => loop {}, | ||
3617 | }; | ||
3618 | i<|> | ||
3619 | () | ||
3620 | } | ||
3621 | "#, | ||
3622 | ); | ||
3623 | assert_eq!(t, "Option<f64>"); | ||
3624 | } | ||
3625 | |||
3626 | #[test] | ||
3627 | fn match_first_arm_never() { | 3603 | fn match_first_arm_never() { |
3628 | covers!(match_first_arm_never); | 3604 | covers!(match_first_arm_never); |
3629 | let t = type_at( | 3605 | let t = type_at( |