From d18d1c05949eaa890e7bb75710816a61b09a93dd Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 20 May 2020 00:19:59 +0200
Subject: Significantly more glorious marks

---
 crates/ra_assists/src/handlers/add_turbo_fish.rs | 12 ++++++------
 crates/ra_assists/src/marks.rs                   |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'crates/ra_assists')

diff --git a/crates/ra_assists/src/handlers/add_turbo_fish.rs b/crates/ra_assists/src/handlers/add_turbo_fish.rs
index a0363bc78..26acf81f2 100644
--- a/crates/ra_assists/src/handlers/add_turbo_fish.rs
+++ b/crates/ra_assists/src/handlers/add_turbo_fish.rs
@@ -1,11 +1,11 @@
 use ra_ide_db::defs::{classify_name_ref, Definition, NameRefClass};
 use ra_syntax::{ast, AstNode, SyntaxKind, T};
+use test_utils::mark;
 
 use crate::{
     assist_context::{AssistContext, Assists},
     AssistId,
 };
-use test_utils::tested_by;
 
 // Assist: add_turbo_fish
 //
@@ -28,7 +28,7 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
     let ident = ctx.find_token_at_offset(SyntaxKind::IDENT)?;
     let next_token = ident.next_token()?;
     if next_token.kind() == T![::] {
-        tested_by!(add_turbo_fish_one_fish_is_enough);
+        mark::hit!(add_turbo_fish_one_fish_is_enough);
         return None;
     }
     let name_ref = ast::NameRef::cast(ident.parent())?;
@@ -42,7 +42,7 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
     };
     let generics = hir::GenericDef::Function(fun).params(ctx.sema.db);
     if generics.is_empty() {
-        tested_by!(add_turbo_fish_non_generic);
+        mark::hit!(add_turbo_fish_non_generic);
         return None;
     }
     acc.add(AssistId("add_turbo_fish"), "Add `::<>`", ident.text_range(), |builder| {
@@ -58,7 +58,7 @@ mod tests {
     use crate::tests::{check_assist, check_assist_not_applicable};
 
     use super::*;
-    use test_utils::covers;
+    use test_utils::mark;
 
     #[test]
     fn add_turbo_fish_function() {
@@ -106,7 +106,7 @@ fn main() {
 
     #[test]
     fn add_turbo_fish_one_fish_is_enough() {
-        covers!(add_turbo_fish_one_fish_is_enough);
+        mark::check!(add_turbo_fish_one_fish_is_enough);
         check_assist_not_applicable(
             add_turbo_fish,
             r#"
@@ -120,7 +120,7 @@ fn main() {
 
     #[test]
     fn add_turbo_fish_non_generic() {
-        covers!(add_turbo_fish_non_generic);
+        mark::check!(add_turbo_fish_non_generic);
         check_assist_not_applicable(
             add_turbo_fish,
             r#"
diff --git a/crates/ra_assists/src/marks.rs b/crates/ra_assists/src/marks.rs
index 722f3c6a4..525ec4abc 100644
--- a/crates/ra_assists/src/marks.rs
+++ b/crates/ra_assists/src/marks.rs
@@ -10,6 +10,4 @@ test_utils::marks![
     test_not_applicable_if_variable_unused
     change_visibility_field_false_positive
     test_add_from_impl_already_exists
-    add_turbo_fish_one_fish_is_enough
-    add_turbo_fish_non_generic
 ];
-- 
cgit v1.2.3