From b292e1b9da39813e2739cb450c263e7502c97c8d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 13 Jun 2021 21:44:31 +0300 Subject: internal: refactor missing match arms diagnostics --- crates/ide/src/diagnostics/missing_match_arms.rs | 924 +++++++++++++++++++++++ 1 file changed, 924 insertions(+) create mode 100644 crates/ide/src/diagnostics/missing_match_arms.rs (limited to 'crates/ide/src/diagnostics') diff --git a/crates/ide/src/diagnostics/missing_match_arms.rs b/crates/ide/src/diagnostics/missing_match_arms.rs new file mode 100644 index 000000000..6b977fa59 --- /dev/null +++ b/crates/ide/src/diagnostics/missing_match_arms.rs @@ -0,0 +1,924 @@ +use hir::InFile; + +use crate::diagnostics::{Diagnostic, DiagnosticsContext}; + +// Diagnostic: missing-match-arm +// +// This diagnostic is triggered if `match` block is missing one or more match arms. +pub(super) fn missing_match_arms( + ctx: &DiagnosticsContext<'_>, + d: &hir::MissingMatchArms, +) -> Diagnostic { + Diagnostic::new( + "missing-match-arm", + "missing match arm", + ctx.sema.diagnostics_display_range(InFile::new(d.file, d.match_expr.clone().into())).range, + ) +} + +#[cfg(test)] +pub(super) mod tests { + use crate::diagnostics::tests::check_diagnostics; + + #[test] + fn empty_tuple() { + check_diagnostics( + r#" +fn main() { + match () { } + //^^ missing match arm + match (()) { } + //^^^^ missing match arm + + match () { _ => (), } + match () { () => (), } + match (()) { (()) => (), } +} +"#, + ); + } + + #[test] + fn tuple_of_two_empty_tuple() { + check_diagnostics( + r#" +fn main() { + match ((), ()) { } + //^^^^^^^^ missing match arm + + match ((), ()) { ((), ()) => (), } +} +"#, + ); + } + + #[test] + fn boolean() { + check_diagnostics( + r#" +fn test_main() { + match false { } + //^^^^^ missing match arm + match false { true => (), } + //^^^^^ missing match arm + match (false, true) {} + //^^^^^^^^^^^^^ missing match arm + match (false, true) { (true, true) => (), } + //^^^^^^^^^^^^^ missing match arm + match (false, true) { + //^^^^^^^^^^^^^ missing match arm + (false, true) => (), + (false, false) => (), + (true, false) => (), + } + match (false, true) { (true, _x) => (), } + //^^^^^^^^^^^^^ missing match arm + + match false { true => (), false => (), } + match (false, true) { + (false, _) => (), + (true, false) => (), + (_, true) => (), + } + match (false, true) { + (true, true) => (), + (true, false) => (), + (false, true) => (), + (false, false) => (), + } + match (false, true) { + (true, _x) => (), + (false, true) => (), + (false, false) => (), + } + match (false, true, false) { + (false, ..) => (), + (true, ..) => (), + } + match (false, true, false) { + (.., false) => (), + (.., true) => (), + } + match (false, true, false) { (..) => (), } +} +"#, + ); + } + + #[test] + fn tuple_of_tuple_and_bools() { + check_diagnostics( + r#" +fn main() { + match (false, ((), false)) {} + //^^^^^^^^^^^^^^^^^^^^ missing match arm + match (false, ((), false)) { (true, ((), true)) => (), } + //^^^^^^^^^^^^^^^^^^^^ missing match arm + match (false, ((), false)) { (true, _) => (), } + //^^^^^^^^^^^^^^^^^^^^ missing match arm + + match (false, ((), false)) { + (true, ((), true)) => (), + (true, ((), false)) => (), + (false, ((), true)) => (), + (false, ((), false)) => (), + } + match (false, ((), false)) { + (true, ((), true)) => (), + (true, ((), false)) => (), + (false, _) => (), + } +} +"#, + ); + } + + #[test] + fn enums() { + check_diagnostics( + r#" +enum Either { A, B, } + +fn main() { + match Either::A { } + //^^^^^^^^^ missing match arm + match Either::B { Either::A => (), } + //^^^^^^^^^ missing match arm + + match &Either::B { + //^^^^^^^^^^ missing match arm + Either::A => (), + } + + match Either::B { + Either::A => (), Either::B => (), + } + match &Either::B { + Either::A => (), Either::B => (), + } +} +"#, + ); + } + + #[test] + fn enum_containing_bool() { + check_diagnostics( + r#" +enum Either { A(bool), B } + +fn main() { + match Either::B { } + //^^^^^^^^^ missing match arm + match Either::B { + //^^^^^^^^^ missing match arm + Either::A(true) => (), Either::B => () + } + + match Either::B { + Either::A(true) => (), + Either::A(false) => (), + Either::B => (), + } + match Either::B { + Either::B => (), + _ => (), + } + match Either::B { + Either::A(_) => (), + Either::B => (), + } + +} + "#, + ); + } + + #[test] + fn enum_different_sizes() { + check_diagnostics( + r#" +enum Either { A(bool), B(bool, bool) } + +fn main() { + match Either::A(false) { + //^^^^^^^^^^^^^^^^ missing match arm + Either::A(_) => (), + Either::B(false, _) => (), + } + + match Either::A(false) { + Either::A(_) => (), + Either::B(true, _) => (), + Either::B(false, _) => (), + } + match Either::A(false) { + Either::A(true) | Either::A(false) => (), + Either::B(true, _) => (), + Either::B(false, _) => (), + } +} +"#, + ); + } + + #[test] + fn tuple_of_enum_no_diagnostic() { + check_diagnostics( + r#" +enum Either { A(bool), B(bool, bool) } +enum Either2 { C, D } + +fn main() { + match (Either::A(false), Either2::C) { + (Either::A(true), _) | (Either::A(false), _) => (), + (Either::B(true, _), Either2::C) => (), + (Either::B(false, _), Either2::C) => (), + (Either::B(_, _), Either2::D) => (), + } +} +"#, + ); + } + + #[test] + fn or_pattern_no_diagnostic() { + check_diagnostics( + r#" +enum Either {A, B} + +fn main() { + match (Either::A, Either::B) { + (Either::A | Either::B, _) => (), + } +}"#, + ) + } + + #[test] + fn mismatched_types() { + // Match statements with arms that don't match the + // expression pattern do not fire this diagnostic. + check_diagnostics( + r#" +enum Either { A, B } +enum Either2 { C, D } + +fn main() { + match Either::A { + Either2::C => (), + // ^^^^^^^^^^ Internal: match check bailed out + Either2::D => (), + } + match (true, false) { + (true, false, true) => (), + // ^^^^^^^^^^^^^^^^^^^ Internal: match check bailed out + (true) => (), + } + match (true, false) { (true,) => {} } + // ^^^^^^^ Internal: match check bailed out + match (0) { () => () } + // ^^ Internal: match check bailed out + match Unresolved::Bar { Unresolved::Baz => () } +} + "#, + ); + } + + #[test] + fn mismatched_types_in_or_patterns() { + check_diagnostics( + r#" +fn main() { + match false { true | () => {} } + // ^^^^^^^^^ Internal: match check bailed out + match (false,) { (true | (),) => {} } + // ^^^^^^^^^^^^ Internal: match check bailed out +} +"#, + ); + } + + #[test] + fn malformed_match_arm_tuple_enum_missing_pattern() { + // We are testing to be sure we don't panic here when the match + // arm `Either::B` is missing its pattern. + check_diagnostics( + r#" +enum Either { A, B(u32) } + +fn main() { + match Either::A { + Either::A => (), + Either::B() => (), + } +} +"#, + ); + } + + #[test] + fn malformed_match_arm_extra_fields() { + check_diagnostics( + r#" +enum A { B(isize, isize), C } +fn main() { + match A::B(1, 2) { + A::B(_, _, _) => (), + // ^^^^^^^^^^^^^ Internal: match check bailed out + } + match A::B(1, 2) { + A::C(_) => (), + // ^^^^^^^ Internal: match check bailed out + } +} +"#, + ); + } + + #[test] + fn expr_diverges() { + check_diagnostics( + r#" +enum Either { A, B } + +fn main() { + match loop {} { + Either::A => (), + // ^^^^^^^^^ Internal: match check bailed out + Either::B => (), + } + match loop {} { + Either::A => (), + // ^^^^^^^^^ Internal: match check bailed out + } + match loop { break Foo::A } { + //^^^^^^^^^^^^^^^^^^^^^ missing match arm + Either::A => (), + } + match loop { break Foo::A } { + Either::A => (), + Either::B => (), + } +} +"#, + ); + } + + #[test] + fn expr_partially_diverges() { + check_diagnostics( + r#" +enum Either { A(T), B } + +fn foo() -> Either { Either::B } +fn main() -> u32 { + match foo() { + Either::A(val) => val, + Either::B => 0, + } +} +"#, + ); + } + + #[test] + fn enum_record() { + check_diagnostics( + r#" +enum Either { A { foo: bool }, B } + +fn main() { + let a = Either::A { foo: true }; + match a { } + //^ missing match arm + match a { Either::A { foo: true } => () } + //^ missing match arm + match a { + Either::A { } => (), + //^^^^^^^^^ Missing structure fields: + // | - foo + Either::B => (), + } + match a { + //^ missing match arm + Either::A { } => (), + } //^^^^^^^^^ Missing structure fields: + // | - foo + + match a { + Either::A { foo: true } => (), + Either::A { foo: false } => (), + Either::B => (), + } + match a { + Either::A { foo: _ } => (), + Either::B => (), + } +} +"#, + ); + } + + #[test] + fn enum_record_fields_out_of_order() { + check_diagnostics( + r#" +enum Either { + A { foo: bool, bar: () }, + B, +} + +fn main() { + let a = Either::A { foo: true, bar: () }; + match a { + //^ missing match arm + Either::A { bar: (), foo: false } => (), + Either::A { foo: true, bar: () } => (), + } + + match a { + Either::A { bar: (), foo: false } => (), + Either::A { foo: true, bar: () } => (), + Either::B => (), + } +} +"#, + ); + } + + #[test] + fn enum_record_ellipsis() { + check_diagnostics( + r#" +enum Either { + A { foo: bool, bar: bool }, + B, +} + +fn main() { + let a = Either::B; + match a { + //^ missing match arm + Either::A { foo: true, .. } => (), + Either::B => (), + } + match a { + //^ missing match arm + Either::A { .. } => (), + } + + match a { + Either::A { foo: true, .. } => (), + Either::A { foo: false, .. } => (), + Either::B => (), + } + + match a { + Either::A { .. } => (), + Either::B => (), + } +} +"#, + ); + } + + #[test] + fn enum_tuple_partial_ellipsis() { + check_diagnostics( + r#" +enum Either { + A(bool, bool, bool, bool), + B, +} + +fn main() { + match Either::B { + //^^^^^^^^^ missing match arm + Either::A(true, .., true) => (), + Either::A(true, .., false) => (), + Either::A(false, .., false) => (), + Either::B => (), + } + match Either::B { + //^^^^^^^^^ missing match arm + Either::A(true, .., true) => (), + Either::A(true, .., false) => (), + Either::A(.., true) => (), + Either::B => (), + } + + match Either::B { + Either::A(true, .., true) => (), + Either::A(true, .., false) => (), + Either::A(false, .., true) => (), + Either::A(false, .., false) => (), + Either::B => (), + } + match Either::B { + Either::A(true, .., true) => (), + Either::A(true, .., false) => (), + Either::A(.., true) => (), + Either::A(.., false) => (), + Either::B => (), + } +} +"#, + ); + } + + #[test] + fn never() { + check_diagnostics( + r#" +enum Never {} + +fn enum_(never: Never) { + match never {} +} +fn enum_ref(never: &Never) { + match never {} + //^^^^^ missing match arm +} +fn bang(never: !) { + match never {} +} +"#, + ); + } + + #[test] + fn unknown_type() { + check_diagnostics( + r#" +enum Option { Some(T), None } + +fn main() { + // `Never` is deliberately not defined so that it's an uninferred type. + match Option::::None { + None => (), + Some(never) => match never {}, + // ^^^^^^^^^^^ Internal: match check bailed out + } + match Option::::None { + //^^^^^^^^^^^^^^^^^^^^^ missing match arm + Option::Some(_never) => {}, + } +} +"#, + ); + } + + #[test] + fn tuple_of_bools_with_ellipsis_at_end_missing_arm() { + check_diagnostics( + r#" +fn main() { + match (false, true, false) { + //^^^^^^^^^^^^^^^^^^^^ missing match arm + (false, ..) => (), + } +}"#, + ); + } + + #[test] + fn tuple_of_bools_with_ellipsis_at_beginning_missing_arm() { + check_diagnostics( + r#" +fn main() { + match (false, true, false) { + //^^^^^^^^^^^^^^^^^^^^ missing match arm + (.., false) => (), + } +}"#, + ); + } + + #[test] + fn tuple_of_bools_with_ellipsis_in_middle_missing_arm() { + check_diagnostics( + r#" +fn main() { + match (false, true, false) { + //^^^^^^^^^^^^^^^^^^^^ missing match arm + (true, .., false) => (), + } +}"#, + ); + } + + #[test] + fn record_struct() { + check_diagnostics( + r#"struct Foo { a: bool } +fn main(f: Foo) { + match f {} + //^ missing match arm + match f { Foo { a: true } => () } + //^ missing match arm + match &f { Foo { a: true } => () } + //^^ missing match arm + match f { Foo { a: _ } => () } + match f { + Foo { a: true } => (), + Foo { a: false } => (), + } + match &f { + Foo { a: true } => (), + Foo { a: false } => (), + } +} +"#, + ); + } + + #[test] + fn tuple_struct() { + check_diagnostics( + r#"struct Foo(bool); +fn main(f: Foo) { + match f {} + //^ missing match arm + match f { Foo(true) => () } + //^ missing match arm + match f { + Foo(true) => (), + Foo(false) => (), + } +} +"#, + ); + } + + #[test] + fn unit_struct() { + check_diagnostics( + r#"struct Foo; +fn main(f: Foo) { + match f {} + //^ missing match arm + match f { Foo => () } +} +"#, + ); + } + + #[test] + fn record_struct_ellipsis() { + check_diagnostics( + r#"struct Foo { foo: bool, bar: bool } +fn main(f: Foo) { + match f { Foo { foo: true, .. } => () } + //^ missing match arm + match f { + //^ missing match arm + Foo { foo: true, .. } => (), + Foo { bar: false, .. } => () + } + match f { Foo { .. } => () } + match f { + Foo { foo: true, .. } => (), + Foo { foo: false, .. } => () + } +} +"#, + ); + } + + #[test] + fn internal_or() { + check_diagnostics( + r#" +fn main() { + enum Either { A(bool), B } + match Either::B { + //^^^^^^^^^ missing match arm + Either::A(true | false) => (), + } +} +"#, + ); + } + + #[test] + fn no_panic_at_unimplemented_subpattern_type() { + check_diagnostics( + r#" +struct S { a: char} +fn main(v: S) { + match v { S{ a } => {} } + match v { S{ a: _x } => {} } + match v { S{ a: 'a' } => {} } + //^^^^^^^^^^^ Internal: match check bailed out + match v { S{..} => {} } + match v { _ => {} } + match v { } + //^ missing match arm +} +"#, + ); + } + + #[test] + fn binding() { + check_diagnostics( + r#" +fn main() { + match true { + _x @ true => {} + false => {} + } + match true { _x @ true => {} } + //^^^^ missing match arm +} +"#, + ); + } + + #[test] + fn binding_ref_has_correct_type() { + // Asserts `PatKind::Binding(ref _x): bool`, not &bool. + // If that's not true match checking will panic with "incompatible constructors" + // FIXME: make facilities to test this directly like `tests::check_infer(..)` + check_diagnostics( + r#" +enum Foo { A } +fn main() { + // FIXME: this should not bail out but current behavior is such as the old algorithm. + // ExprValidator::validate_match(..) checks types of top level patterns incorrecly. + match Foo::A { + ref _x => {} + // ^^^^^^ Internal: match check bailed out + Foo::A => {} + } + match (true,) { + (ref _x,) => {} + (true,) => {} + } +} +"#, + ); + } + + #[test] + fn enum_non_exhaustive() { + check_diagnostics( + r#" +//- /lib.rs crate:lib +#[non_exhaustive] +pub enum E { A, B } +fn _local() { + match E::A { _ => {} } + match E::A { + E::A => {} + E::B => {} + } + match E::A { + E::A | E::B => {} + } +} + +//- /main.rs crate:main deps:lib +use lib::E; +fn main() { + match E::A { _ => {} } + match E::A { + //^^^^ missing match arm + E::A => {} + E::B => {} + } + match E::A { + //^^^^ missing match arm + E::A | E::B => {} + } +} +"#, + ); + } + + #[test] + fn match_guard() { + check_diagnostics( + r#" +fn main() { + match true { + true if false => {} + true => {} + false => {} + } + match true { + //^^^^ missing match arm + true if false => {} + false => {} + } +} +"#, + ); + } + + #[test] + fn pattern_type_is_of_substitution() { + cov_mark::check!(match_check_wildcard_expanded_to_substitutions); + check_diagnostics( + r#" +struct Foo(T); +struct Bar; +fn main() { + match Foo(Bar) { + _ | Foo(Bar) => {} + } +} +"#, + ); + } + + #[test] + fn record_struct_no_such_field() { + check_diagnostics( + r#" +struct Foo { } +fn main(f: Foo) { + match f { Foo { bar } => () } + // ^^^^^^^^^^^ Internal: match check bailed out +} +"#, + ); + } + + #[test] + fn match_ergonomics_issue_9095() { + check_diagnostics( + r#" +enum Foo { A(T) } +fn main() { + match &Foo::A(true) { + _ => {} + Foo::A(_) => {} + } +} +"#, + ); + } + + mod false_negatives { + //! The implementation of match checking here is a work in progress. As we roll this out, we + //! prefer false negatives to false positives (ideally there would be no false positives). This + //! test module should document known false negatives. Eventually we will have a complete + //! implementation of match checking and this module will be empty. + //! + //! The reasons for documenting known false negatives: + //! + //! 1. It acts as a backlog of work that can be done to improve the behavior of the system. + //! 2. It ensures the code doesn't panic when handling these cases. + use super::*; + + #[test] + fn integers() { + // We don't currently check integer exhaustiveness. + check_diagnostics( + r#" +fn main() { + match 5 { + 10 => (), + // ^^ Internal: match check bailed out + 11..20 => (), + } +} +"#, + ); + } + + #[test] + fn reference_patterns_at_top_level() { + check_diagnostics( + r#" +fn main() { + match &false { + &true => {} + // ^^^^^ Internal: match check bailed out + } +} + "#, + ); + } + + #[test] + fn reference_patterns_in_fields() { + check_diagnostics( + r#" +fn main() { + match (&false,) { + (true,) => {} + // ^^^^^^^ Internal: match check bailed out + } + match (&false,) { + (&true,) => {} + // ^^^^^^^^ Internal: match check bailed out + } +} + "#, + ); + } + } +} -- cgit v1.2.3 From 935c53b92eea7c288b781ecd68436c9733ec8a83 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sun, 13 Jun 2021 21:55:51 +0300 Subject: internal: use cov-mark rather than bailing out diagnostic --- crates/ide/src/diagnostics/missing_match_arms.rs | 99 +++++++++++++----------- 1 file changed, 52 insertions(+), 47 deletions(-) (limited to 'crates/ide/src/diagnostics') diff --git a/crates/ide/src/diagnostics/missing_match_arms.rs b/crates/ide/src/diagnostics/missing_match_arms.rs index 6b977fa59..b636489b3 100644 --- a/crates/ide/src/diagnostics/missing_match_arms.rs +++ b/crates/ide/src/diagnostics/missing_match_arms.rs @@ -20,9 +20,14 @@ pub(super) fn missing_match_arms( pub(super) mod tests { use crate::diagnostics::tests::check_diagnostics; + fn check_diagnostics_no_bails(ra_fixture: &str) { + cov_mark::check_count!(validate_match_bailed_out, 0); + crate::diagnostics::tests::check_diagnostics(ra_fixture) + } + #[test] fn empty_tuple() { - check_diagnostics( + check_diagnostics_no_bails( r#" fn main() { match () { } @@ -40,7 +45,7 @@ fn main() { #[test] fn tuple_of_two_empty_tuple() { - check_diagnostics( + check_diagnostics_no_bails( r#" fn main() { match ((), ()) { } @@ -54,7 +59,7 @@ fn main() { #[test] fn boolean() { - check_diagnostics( + check_diagnostics_no_bails( r#" fn test_main() { match false { } @@ -107,7 +112,7 @@ fn test_main() { #[test] fn tuple_of_tuple_and_bools() { - check_diagnostics( + check_diagnostics_no_bails( r#" fn main() { match (false, ((), false)) {} @@ -135,7 +140,7 @@ fn main() { #[test] fn enums() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either { A, B, } @@ -163,7 +168,7 @@ fn main() { #[test] fn enum_containing_bool() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either { A(bool), B } @@ -196,7 +201,7 @@ fn main() { #[test] fn enum_different_sizes() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either { A(bool), B(bool, bool) } @@ -224,7 +229,7 @@ fn main() { #[test] fn tuple_of_enum_no_diagnostic() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either { A(bool), B(bool, bool) } enum Either2 { C, D } @@ -243,7 +248,7 @@ fn main() { #[test] fn or_pattern_no_diagnostic() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either {A, B} @@ -257,6 +262,7 @@ fn main() { #[test] fn mismatched_types() { + cov_mark::check_count!(validate_match_bailed_out, 4); // Match statements with arms that don't match the // expression pattern do not fire this diagnostic. check_diagnostics( @@ -267,18 +273,14 @@ enum Either2 { C, D } fn main() { match Either::A { Either2::C => (), - // ^^^^^^^^^^ Internal: match check bailed out Either2::D => (), } match (true, false) { (true, false, true) => (), - // ^^^^^^^^^^^^^^^^^^^ Internal: match check bailed out (true) => (), } match (true, false) { (true,) => {} } - // ^^^^^^^ Internal: match check bailed out match (0) { () => () } - // ^^ Internal: match check bailed out match Unresolved::Bar { Unresolved::Baz => () } } "#, @@ -287,13 +289,12 @@ fn main() { #[test] fn mismatched_types_in_or_patterns() { + cov_mark::check_count!(validate_match_bailed_out, 2); check_diagnostics( r#" fn main() { match false { true | () => {} } - // ^^^^^^^^^ Internal: match check bailed out match (false,) { (true | (),) => {} } - // ^^^^^^^^^^^^ Internal: match check bailed out } "#, ); @@ -303,7 +304,7 @@ fn main() { fn malformed_match_arm_tuple_enum_missing_pattern() { // We are testing to be sure we don't panic here when the match // arm `Either::B` is missing its pattern. - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either { A, B(u32) } @@ -319,17 +320,16 @@ fn main() { #[test] fn malformed_match_arm_extra_fields() { + cov_mark::check_count!(validate_match_bailed_out, 2); check_diagnostics( r#" enum A { B(isize, isize), C } fn main() { match A::B(1, 2) { A::B(_, _, _) => (), - // ^^^^^^^^^^^^^ Internal: match check bailed out } match A::B(1, 2) { A::C(_) => (), - // ^^^^^^^ Internal: match check bailed out } } "#, @@ -338,6 +338,7 @@ fn main() { #[test] fn expr_diverges() { + cov_mark::check_count!(validate_match_bailed_out, 2); check_diagnostics( r#" enum Either { A, B } @@ -345,12 +346,10 @@ enum Either { A, B } fn main() { match loop {} { Either::A => (), - // ^^^^^^^^^ Internal: match check bailed out Either::B => (), } match loop {} { Either::A => (), - // ^^^^^^^^^ Internal: match check bailed out } match loop { break Foo::A } { //^^^^^^^^^^^^^^^^^^^^^ missing match arm @@ -367,7 +366,7 @@ fn main() { #[test] fn expr_partially_diverges() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either { A(T), B } @@ -384,7 +383,7 @@ fn main() -> u32 { #[test] fn enum_record() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either { A { foo: bool }, B } @@ -422,7 +421,7 @@ fn main() { #[test] fn enum_record_fields_out_of_order() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either { A { foo: bool, bar: () }, @@ -449,7 +448,7 @@ fn main() { #[test] fn enum_record_ellipsis() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either { A { foo: bool, bar: bool }, @@ -485,7 +484,7 @@ fn main() { #[test] fn enum_tuple_partial_ellipsis() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Either { A(bool, bool, bool, bool), @@ -529,7 +528,7 @@ fn main() { #[test] fn never() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Never {} @@ -549,6 +548,8 @@ fn bang(never: !) { #[test] fn unknown_type() { + cov_mark::check_count!(validate_match_bailed_out, 1); + check_diagnostics( r#" enum Option { Some(T), None } @@ -558,7 +559,6 @@ fn main() { match Option::::None { None => (), Some(never) => match never {}, - // ^^^^^^^^^^^ Internal: match check bailed out } match Option::::None { //^^^^^^^^^^^^^^^^^^^^^ missing match arm @@ -571,7 +571,7 @@ fn main() { #[test] fn tuple_of_bools_with_ellipsis_at_end_missing_arm() { - check_diagnostics( + check_diagnostics_no_bails( r#" fn main() { match (false, true, false) { @@ -584,7 +584,7 @@ fn main() { #[test] fn tuple_of_bools_with_ellipsis_at_beginning_missing_arm() { - check_diagnostics( + check_diagnostics_no_bails( r#" fn main() { match (false, true, false) { @@ -597,7 +597,7 @@ fn main() { #[test] fn tuple_of_bools_with_ellipsis_in_middle_missing_arm() { - check_diagnostics( + check_diagnostics_no_bails( r#" fn main() { match (false, true, false) { @@ -610,7 +610,7 @@ fn main() { #[test] fn record_struct() { - check_diagnostics( + check_diagnostics_no_bails( r#"struct Foo { a: bool } fn main(f: Foo) { match f {} @@ -635,7 +635,7 @@ fn main(f: Foo) { #[test] fn tuple_struct() { - check_diagnostics( + check_diagnostics_no_bails( r#"struct Foo(bool); fn main(f: Foo) { match f {} @@ -653,7 +653,7 @@ fn main(f: Foo) { #[test] fn unit_struct() { - check_diagnostics( + check_diagnostics_no_bails( r#"struct Foo; fn main(f: Foo) { match f {} @@ -666,7 +666,7 @@ fn main(f: Foo) { #[test] fn record_struct_ellipsis() { - check_diagnostics( + check_diagnostics_no_bails( r#"struct Foo { foo: bool, bar: bool } fn main(f: Foo) { match f { Foo { foo: true, .. } => () } @@ -688,7 +688,7 @@ fn main(f: Foo) { #[test] fn internal_or() { - check_diagnostics( + check_diagnostics_no_bails( r#" fn main() { enum Either { A(bool), B } @@ -703,6 +703,8 @@ fn main() { #[test] fn no_panic_at_unimplemented_subpattern_type() { + cov_mark::check_count!(validate_match_bailed_out, 1); + check_diagnostics( r#" struct S { a: char} @@ -710,7 +712,6 @@ fn main(v: S) { match v { S{ a } => {} } match v { S{ a: _x } => {} } match v { S{ a: 'a' } => {} } - //^^^^^^^^^^^ Internal: match check bailed out match v { S{..} => {} } match v { _ => {} } match v { } @@ -722,7 +723,7 @@ fn main(v: S) { #[test] fn binding() { - check_diagnostics( + check_diagnostics_no_bails( r#" fn main() { match true { @@ -738,6 +739,8 @@ fn main() { #[test] fn binding_ref_has_correct_type() { + cov_mark::check_count!(validate_match_bailed_out, 1); + // Asserts `PatKind::Binding(ref _x): bool`, not &bool. // If that's not true match checking will panic with "incompatible constructors" // FIXME: make facilities to test this directly like `tests::check_infer(..)` @@ -749,7 +752,6 @@ fn main() { // ExprValidator::validate_match(..) checks types of top level patterns incorrecly. match Foo::A { ref _x => {} - // ^^^^^^ Internal: match check bailed out Foo::A => {} } match (true,) { @@ -763,7 +765,7 @@ fn main() { #[test] fn enum_non_exhaustive() { - check_diagnostics( + check_diagnostics_no_bails( r#" //- /lib.rs crate:lib #[non_exhaustive] @@ -799,7 +801,7 @@ fn main() { #[test] fn match_guard() { - check_diagnostics( + check_diagnostics_no_bails( r#" fn main() { match true { @@ -820,7 +822,7 @@ fn main() { #[test] fn pattern_type_is_of_substitution() { cov_mark::check!(match_check_wildcard_expanded_to_substitutions); - check_diagnostics( + check_diagnostics_no_bails( r#" struct Foo(T); struct Bar; @@ -835,12 +837,13 @@ fn main() { #[test] fn record_struct_no_such_field() { + cov_mark::check_count!(validate_match_bailed_out, 1); + check_diagnostics( r#" struct Foo { } fn main(f: Foo) { match f { Foo { bar } => () } - // ^^^^^^^^^^^ Internal: match check bailed out } "#, ); @@ -848,7 +851,7 @@ fn main(f: Foo) { #[test] fn match_ergonomics_issue_9095() { - check_diagnostics( + check_diagnostics_no_bails( r#" enum Foo { A(T) } fn main() { @@ -875,13 +878,14 @@ fn main() { #[test] fn integers() { + cov_mark::check_count!(validate_match_bailed_out, 1); + // We don't currently check integer exhaustiveness. check_diagnostics( r#" fn main() { match 5 { 10 => (), - // ^^ Internal: match check bailed out 11..20 => (), } } @@ -891,12 +895,13 @@ fn main() { #[test] fn reference_patterns_at_top_level() { + cov_mark::check_count!(validate_match_bailed_out, 1); + check_diagnostics( r#" fn main() { match &false { &true => {} - // ^^^^^ Internal: match check bailed out } } "#, @@ -905,16 +910,16 @@ fn main() { #[test] fn reference_patterns_in_fields() { + cov_mark::check_count!(validate_match_bailed_out, 2); + check_diagnostics( r#" fn main() { match (&false,) { (true,) => {} - // ^^^^^^^ Internal: match check bailed out } match (&false,) { (&true,) => {} - // ^^^^^^^^ Internal: match check bailed out } } "#, -- cgit v1.2.3