Merge #8029

8029: Enable thread-local coverage marks r=JoshMcguigan a=lnicola



Co-authored-by: Laurențiu Nicola <[email protected]>

10 files changed, 10 insertions, 12 deletions

diff --git a/crates/hir_def/Cargo.toml b/crates/hir_def/Cargo.toml
index c2d99280f..475d337f3 100644
--- a/crates/hir_def/Cargo.toml
+++ b/crates/hir_def/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-cov-mark = "1.1"
+cov-mark = { version = "1.1", features = ["thread-local"] }
 log = "0.4.8"
 once_cell = "1.3.1"
 rustc-hash = "1.1.0"
diff --git a/crates/hir_ty/Cargo.toml b/crates/hir_ty/Cargo.toml
index b9c93f56f..0ef27cd37 100644
--- a/crates/hir_ty/Cargo.toml
+++ b/crates/hir_ty/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-cov-mark = "1.1"
+cov-mark = { version = "1.1", features = ["thread-local"] }
 itertools = "0.10.0"
 arrayvec = "0.5.1"
 smallvec = "1.2.0"
@@ -31,7 +31,7 @@ profile = { path = "../profile", version = "0.0.0" }
 syntax = { path = "../syntax", version = "0.0.0" }
 
 [dev-dependencies]
-test_utils = { path = "../test_utils"  }
+test_utils = { path = "../test_utils" }
 expect-test = "1.1"
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", default-features = false, features = ["env-filter", "registry"] }
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index 6ae7c9e6c..f04bcf531 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-cov-mark = "1.1"
+cov-mark = { version = "1.1", features = ["thread-local"] }
 either = "1.5.3"
 indexmap = "1.4.0"
 itertools = "0.10.0"
diff --git a/crates/ide_assists/Cargo.toml b/crates/ide_assists/Cargo.toml
index dd9aa27c6..a83acb191 100644
--- a/crates/ide_assists/Cargo.toml
+++ b/crates/ide_assists/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-cov-mark = "1.1"
+cov-mark = { version = "1.1", features = ["thread-local"] }
 rustc-hash = "1.1.0"
 itertools = "0.10.0"
 either = "1.6.1"
diff --git a/crates/ide_completion/Cargo.toml b/crates/ide_completion/Cargo.toml
index 585ecca50..6bd8a5500 100644
--- a/crates/ide_completion/Cargo.toml
+++ b/crates/ide_completion/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-cov-mark = "1.1"
+cov-mark = { version = "1.1", features = ["thread-local"] }
 itertools = "0.10.0"
 log = "0.4.8"
 rustc-hash = "1.1.0"
diff --git a/crates/ide_completion/src/context.rs b/crates/ide_completion/src/context.rs
index 89e9bda78..e6cc6329c 100644
--- a/crates/ide_completion/src/context.rs
+++ b/crates/ide_completion/src/context.rs
@@ -350,7 +350,6 @@ impl<'a> CompletionContext<'a> {
                         },
                         ast::IdentPat(it) => {
                             cov_mark::hit!(expected_type_if_let_with_leading_char);
-                            cov_mark::hit!(expected_type_if_let_without_leading_char);
                             cov_mark::hit!(expected_type_match_arm_with_leading_char);
                             let ty = self.sema.type_of_pat(&ast::Pat::from(it));
 
@@ -748,7 +747,6 @@ fn foo() {
 
     #[test]
     fn expected_type_if_let_without_leading_char() {
-        cov_mark::check!(expected_type_if_let_without_leading_char);
         check_expected_type_and_name(
             r#"
 enum Foo { Bar, Baz, Quux }
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml
index 1f7a90d20..6229996ec 100644
--- a/crates/ide_db/Cargo.toml
+++ b/crates/ide_db/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-cov-mark = "1.1"
+cov-mark = { version = "1.1", features = ["thread-local"] }
 log = "0.4.8"
 rayon = "1.5.0"
 fst = { version = "0.4", default-features = false }
diff --git a/crates/ide_ssr/Cargo.toml b/crates/ide_ssr/Cargo.toml
index 8c31df13a..5d2221ebc 100644
--- a/crates/ide_ssr/Cargo.toml
+++ b/crates/ide_ssr/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-cov-mark = "1.1"
+cov-mark = { version = "1.1", features = ["thread-local"] }
 rustc-hash = "1.1.0"
 itertools = "0.10.0"
 
diff --git a/crates/mbe/Cargo.toml b/crates/mbe/Cargo.toml
index 139214207..8856787c0 100644
--- a/crates/mbe/Cargo.toml
+++ b/crates/mbe/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-cov-mark = "1.1"
+cov-mark = { version = "1.1", features = ["thread-local"] }
 rustc-hash = "1.1.0"
 smallvec = "1.2.0"
 log = "0.4.8"
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
index 05fca5dc4..c0fd894b0 100644
--- a/crates/syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
-cov-mark = "1.1"
+cov-mark = { version = "1.1", features = ["thread-local"] }
 itertools = "0.10.0"
 rowan = "0.12.2"
 rustc_lexer = { version = "710.0.0", package = "rustc-ap-rustc_lexer" }