Merge #9243

9243: internal: check that coverage marks are always paired r=matklad a=matklad

bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

4 files changed, 8 insertions, 5 deletions

diff --git a/crates/hir_def/src/body/tests/block.rs b/crates/hir_def/src/body/tests/block.rs
index bc3d0f138..15c10d053 100644
--- a/crates/hir_def/src/body/tests/block.rs
+++ b/crates/hir_def/src/body/tests/block.rs
@@ -163,14 +163,14 @@ fn legacy_macro_items() {
     // correctly.
     check_at(
         r#"
-macro_rules! hit {
+macro_rules! mark {
     () => {
         struct Hit {}
     }
 }
 
 fn f() {
-    hit!();
+    mark!();
     $0
 }
 "#,
@@ -193,20 +193,20 @@ use core::cov_mark;
 
 fn f() {
     fn nested() {
-        cov_mark::hit!(Hit);
+        cov_mark::mark!(Hit);
         $0
     }
 }
 //- /core.rs crate:core
 pub mod cov_mark {
     #[macro_export]
-    macro_rules! _hit {
+    macro_rules! _mark {
         ($name:ident) => {
             struct $name {}
         }
     }
 
-    pub use crate::_hit as hit;
+    pub use crate::_mark as mark;
 }
 "#,
         expect![[r#"
diff --git a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
index 088d2791e..471cd4921 100644
--- a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
+++ b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs
@@ -664,6 +664,7 @@ impl Fields {
                         let is_non_exhaustive =
                             is_field_list_non_exhaustive(variant_id, cx) && !adt_is_local;
 
+                        cov_mark::hit!(match_check_wildcard_expanded_to_substitutions);
                         let field_ty_data = cx.db.field_types(variant_id);
                         let field_tys = || {
                             field_ty_data
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 31d5cfedc..337a904b6 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -2172,6 +2172,7 @@ fn main() {
 
     #[test]
     fn pattern_type_is_of_substitution() {
+        cov_mark::check!(match_check_wildcard_expanded_to_substitutions);
         check_diagnostics(
             r#"
 struct Foo<T>(T);
diff --git a/crates/ide_completion/src/render.rs b/crates/ide_completion/src/render.rs
index a55081631..d8ca18c73 100644
--- a/crates/ide_completion/src/render.rs
+++ b/crates/ide_completion/src/render.rs
@@ -1007,6 +1007,7 @@ fn go(world: &WorldSnapshot) { go(w$0) }
 
     #[test]
     fn too_many_arguments() {
+        cov_mark::check!(too_many_arguments);
         check_relevance(
             r#"
 struct Foo;