From fc9eed4836dfc88fe2893c81b015ab440cea2ba6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lauren=C8=9Biu=20Nicola?= Date: Mon, 8 Mar 2021 22:19:44 +0200 Subject: Use upstream cov-mark --- crates/hir_def/src/nameres/tests/diagnostics.rs | 5 ++--- crates/hir_def/src/nameres/tests/globs.rs | 8 ++++---- crates/hir_def/src/nameres/tests/macros.rs | 10 +++++----- crates/hir_def/src/nameres/tests/mod_resolution.rs | 4 ++-- 4 files changed, 13 insertions(+), 14 deletions(-) (limited to 'crates/hir_def/src/nameres/tests') diff --git a/crates/hir_def/src/nameres/tests/diagnostics.rs b/crates/hir_def/src/nameres/tests/diagnostics.rs index e8e72e5ef..d5ef8ceb5 100644 --- a/crates/hir_def/src/nameres/tests/diagnostics.rs +++ b/crates/hir_def/src/nameres/tests/diagnostics.rs @@ -1,5 +1,4 @@ use base_db::fixture::WithFixture; -use test_utils::mark; use crate::test_db::TestDB; @@ -63,7 +62,7 @@ fn unresolved_extern_crate() { #[test] fn extern_crate_self_as() { - mark::check!(extern_crate_self_as); + cov_mark::check!(extern_crate_self_as); check_diagnostics( r" //- /lib.rs @@ -140,7 +139,7 @@ fn inactive_item() { /// Tests that `cfg` attributes behind `cfg_attr` is handled properly. #[test] fn inactive_via_cfg_attr() { - mark::check!(cfg_attr_active); + cov_mark::check!(cfg_attr_active); check_diagnostics( r#" //- /lib.rs diff --git a/crates/hir_def/src/nameres/tests/globs.rs b/crates/hir_def/src/nameres/tests/globs.rs index 2ae836e3c..17426d54d 100644 --- a/crates/hir_def/src/nameres/tests/globs.rs +++ b/crates/hir_def/src/nameres/tests/globs.rs @@ -148,7 +148,7 @@ pub(crate) struct PubCrateStruct; #[test] fn glob_across_crates() { - mark::check!(glob_across_crates); + cov_mark::check!(glob_across_crates); check( r#" //- /main.rs crate:main deps:test_crate @@ -184,7 +184,7 @@ struct Foo; #[test] fn glob_enum() { - mark::check!(glob_enum); + cov_mark::check!(glob_enum); check( r#" enum Foo { Bar, Baz } @@ -201,7 +201,7 @@ use self::Foo::*; #[test] fn glob_enum_group() { - mark::check!(glob_enum_group); + cov_mark::check!(glob_enum_group); check( r#" enum Foo { Bar, Baz } @@ -218,7 +218,7 @@ use self::Foo::{*}; #[test] fn glob_shadowed_def() { - mark::check!(import_shadowed); + cov_mark::check!(import_shadowed); check( r#" //- /lib.rs diff --git a/crates/hir_def/src/nameres/tests/macros.rs b/crates/hir_def/src/nameres/tests/macros.rs index 36ed5e8ce..f65a655bf 100644 --- a/crates/hir_def/src/nameres/tests/macros.rs +++ b/crates/hir_def/src/nameres/tests/macros.rs @@ -210,7 +210,7 @@ macro_rules! bar { #[test] fn macro_rules_from_other_crates_are_visible_with_macro_use() { - mark::check!(macro_rules_from_other_crates_are_visible_with_macro_use); + cov_mark::check!(macro_rules_from_other_crates_are_visible_with_macro_use); check( r#" //- /main.rs crate:main deps:foo @@ -260,7 +260,7 @@ mod priv_mod { #[test] fn prelude_is_macro_use() { - mark::check!(prelude_is_macro_use); + cov_mark::check!(prelude_is_macro_use); check( r#" //- /main.rs crate:main deps:foo @@ -550,7 +550,7 @@ mod m { #[test] fn macro_dollar_crate_is_correct_in_item() { - mark::check!(macro_dollar_crate_self); + cov_mark::check!(macro_dollar_crate_self); check( r#" //- /main.rs crate:main deps:foo @@ -608,7 +608,7 @@ struct Baz; #[test] fn macro_dollar_crate_is_correct_in_indirect_deps() { - mark::check!(macro_dollar_crate_other); + cov_mark::check!(macro_dollar_crate_other); // From std check( r#" @@ -686,7 +686,7 @@ pub trait Clone {} #[test] fn macro_expansion_overflow() { - mark::check!(macro_expansion_overflow); + cov_mark::check!(macro_expansion_overflow); check( r#" macro_rules! a { diff --git a/crates/hir_def/src/nameres/tests/mod_resolution.rs b/crates/hir_def/src/nameres/tests/mod_resolution.rs index e80b593aa..dfbbad1f9 100644 --- a/crates/hir_def/src/nameres/tests/mod_resolution.rs +++ b/crates/hir_def/src/nameres/tests/mod_resolution.rs @@ -2,7 +2,7 @@ use super::*; #[test] fn name_res_works_for_broken_modules() { - mark::check!(name_res_works_for_broken_modules); + cov_mark::check!(name_res_works_for_broken_modules); check( r" //- /lib.rs @@ -774,7 +774,7 @@ struct X; #[test] fn circular_mods() { - mark::check!(circular_mods); + cov_mark::check!(circular_mods); compute_crate_def_map( r#" //- /lib.rs -- cgit v1.2.3