6 files changed, 65 insertions, 18 deletions

diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
index 9ee3a8586..33bde099b 100644
--- a/crates/syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -11,6 +11,7 @@ edition = "2018"
 doctest = false
 
 [dependencies]
+cov-mark = "1.1"
 itertools = "0.10.0"
 rowan = "0.12.2"
 rustc_lexer = { version = "709.0.0", package = "rustc-ap-rustc_lexer" }
@@ -24,10 +25,10 @@ serde = { version = "1.0.106", features = ["derive"] }
 stdx = { path = "../stdx", version = "0.0.0" }
 text_edit = { path = "../text_edit", version = "0.0.0" }
 parser = { path = "../parser", version = "0.0.0" }
-test_utils = { path = "../test_utils", version = "0.0.0" }
 profile = { path = "../profile", version = "0.0.0" }
 
 [dev-dependencies]
+test_utils = { path = "../test_utils" }
 walkdir = "2.3.1"
 rayon = "1"
 expect-test = "1.1"
diff --git a/crates/syntax/src/algo.rs b/crates/syntax/src/algo.rs
index 2ff92f9f6..b13252eec 100644
--- a/crates/syntax/src/algo.rs
+++ b/crates/syntax/src/algo.rs
@@ -10,7 +10,6 @@ use std::{
 use indexmap::IndexMap;
 use itertools::Itertools;
 use rustc_hash::FxHashMap;
-use test_utils::mark;
 use text_edit::TextEditBuilder;
 
 use crate::{
@@ -184,7 +183,7 @@ pub fn diff(from: &SyntaxNode, to: &SyntaxNode) -> TreeDiff {
         let (lhs, rhs) = match lhs.as_node().zip(rhs.as_node()) {
             Some((lhs, rhs)) => (lhs, rhs),
             _ => {
-                mark::hit!(diff_node_token_replace);
+                cov_mark::hit!(diff_node_token_replace);
                 diff.replacements.insert(lhs, rhs);
                 return;
             }
@@ -202,19 +201,19 @@ pub fn diff(from: &SyntaxNode, to: &SyntaxNode) -> TreeDiff {
                 (None, Some(element)) => {
                     let insert_pos = match last_lhs.clone() {
                         Some(prev) => {
-                            mark::hit!(diff_insert);
+                            cov_mark::hit!(diff_insert);
                             TreeDiffInsertPos::After(prev)
                         }
                         // first iteration, insert into out parent as the first child
                         None => {
-                            mark::hit!(diff_insert_as_first_child);
+                            cov_mark::hit!(diff_insert_as_first_child);
                             TreeDiffInsertPos::AsFirstChild(lhs.clone().into())
                         }
                     };
                     diff.insertions.entry(insert_pos).or_insert_with(Vec::new).push(element);
                 }
                 (Some(element), None) => {
-                    mark::hit!(diff_delete);
+                    cov_mark::hit!(diff_delete);
                     diff.deletions.push(element);
                 }
                 (Some(ref lhs_ele), Some(ref rhs_ele)) if syntax_element_eq(lhs_ele, rhs_ele) => {}
@@ -228,7 +227,7 @@ pub fn diff(from: &SyntaxNode, to: &SyntaxNode) -> TreeDiff {
                     let mut insert = false;
                     while let Some(rhs_child) = rhs_children_clone.next() {
                         if syntax_element_eq(&lhs_ele, &rhs_child) {
-                            mark::hit!(diff_insertions);
+                            cov_mark::hit!(diff_insertions);
                             insert = true;
                             break;
                         } else {
@@ -240,7 +239,7 @@ pub fn diff(from: &SyntaxNode, to: &SyntaxNode) -> TreeDiff {
                         let insert_pos = if let Some(prev) = last_lhs.clone().filter(|_| insert) {
                             TreeDiffInsertPos::After(prev)
                         } else {
-                            mark::hit!(insert_first_child);
+                            cov_mark::hit!(insert_first_child);
                             TreeDiffInsertPos::AsFirstChild(lhs.clone().into())
                         };
 
@@ -635,14 +634,13 @@ mod tests {
     use expect_test::{expect, Expect};
     use itertools::Itertools;
     use parser::SyntaxKind;
-    use test_utils::mark;
     use text_edit::TextEdit;
 
     use crate::{AstNode, SyntaxElement};
 
     #[test]
     fn replace_node_token() {
-        mark::check!(diff_node_token_replace);
+        cov_mark::check!(diff_node_token_replace);
         check_diff(
             r#"use node;"#,
             r#"ident"#,
@@ -666,7 +664,7 @@ mod tests {
 
     #[test]
     fn replace_parent() {
-        mark::check!(diff_insert_as_first_child);
+        cov_mark::check!(diff_insert_as_first_child);
         check_diff(
             r#""#,
             r#"use foo::bar;"#,
@@ -689,7 +687,7 @@ mod tests {
 
     #[test]
     fn insert_last() {
-        mark::check!(diff_insert);
+        cov_mark::check!(diff_insert);
         check_diff(
             r#"
 use foo;
@@ -774,7 +772,7 @@ use baz;"#,
 
     #[test]
     fn first_child_insertion() {
-        mark::check!(insert_first_child);
+        cov_mark::check!(insert_first_child);
         check_diff(
             r#"fn main() {
         stdi
@@ -804,7 +802,7 @@ use baz;"#,
 
     #[test]
     fn delete_last() {
-        mark::check!(diff_delete);
+        cov_mark::check!(diff_delete);
         check_diff(
             r#"use foo;
             use bar;"#,
@@ -828,7 +826,7 @@ use baz;"#,
 
     #[test]
     fn delete_middle() {
-        mark::check!(diff_insertions);
+        cov_mark::check!(diff_insertions);
         check_diff(
             r#"
 use expect_test::{expect, Expect};
diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs
index b6c5de658..70ba8adb4 100644
--- a/crates/syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs
@@ -91,6 +91,10 @@ pub fn path_from_segments(
     })
 }
 
+pub fn path_from_text(text: &str) -> ast::Path {
+    ast_from_text(&format!("fn main() {{ let test = {}; }}", text))
+}
+
 pub fn glob_use_tree() -> ast::UseTree {
     ast_from_text("use *;")
 }
diff --git a/crates/syntax/src/lib.rs b/crates/syntax/src/lib.rs
index 11294c5b2..09e212e8c 100644
--- a/crates/syntax/src/lib.rs
+++ b/crates/syntax/src/lib.rs
@@ -37,6 +37,7 @@ pub mod algo;
 pub mod ast;
 #[doc(hidden)]
 pub mod fuzz;
+pub mod utils;
 
 use std::{marker::PhantomData, sync::Arc};
 
diff --git a/crates/syntax/src/tests.rs b/crates/syntax/src/tests.rs
index b2c06e24f..ba0ccfaed 100644
--- a/crates/syntax/src/tests.rs
+++ b/crates/syntax/src/tests.rs
@@ -7,7 +7,7 @@ use std::{
 use ast::NameOwner;
 use expect_test::expect_file;
 use rayon::prelude::*;
-use test_utils::{bench, bench_fixture, project_dir, skip_slow_tests};
+use test_utils::{bench, bench_fixture, project_root, skip_slow_tests};
 
 use crate::{ast, fuzz, tokenize, AstNode, SourceFile, SyntaxError, TextRange, TextSize, Token};
 
@@ -153,7 +153,7 @@ fn reparse_fuzz_tests() {
 /// Test that Rust-analyzer can parse and validate the rust-analyzer
 #[test]
 fn self_hosting_parsing() {
-    let dir = project_dir().join("crates");
+    let dir = project_root().join("crates");
     let files = walkdir::WalkDir::new(dir)
         .into_iter()
         .filter_entry(|entry| {
@@ -193,7 +193,7 @@ fn self_hosting_parsing() {
 }
 
 fn test_data_dir() -> PathBuf {
-    project_dir().join("crates/syntax/test_data")
+    project_root().join("crates/syntax/test_data")
 }
 
 fn assert_errors_are_present(errors: &[SyntaxError], path: &Path) {
diff --git a/crates/syntax/src/utils.rs b/crates/syntax/src/utils.rs
new file mode 100644
index 000000000..f4c02518b
--- /dev/null
+++ b/crates/syntax/src/utils.rs
@@ -0,0 +1,43 @@
+//! A set of utils methods to reuse on other abstraction levels
+
+use itertools::Itertools;
+
+use crate::{ast, match_ast, AstNode};
+
+pub fn path_to_string_stripping_turbo_fish(path: &ast::Path) -> String {
+    path.syntax()
+        .children()
+        .filter_map(|node| {
+            match_ast! {
+                match node {
+                    ast::PathSegment(it) => {
+                        Some(it.name_ref()?.to_string())
+                    },
+                    ast::Path(it) => {
+                        Some(path_to_string_stripping_turbo_fish(&it))
+                    },
+                    _ => None,
+                }
+            }
+        })
+        .join("::")
+}
+
+#[cfg(test)]
+mod tests {
+    use super::path_to_string_stripping_turbo_fish;
+    use crate::ast::make;
+
+    #[test]
+    fn turbofishes_are_stripped() {
+        assert_eq!("Vec", path_to_string_stripping_turbo_fish(&make::path_from_text("Vec::<i32>")),);
+        assert_eq!(
+            "Vec::new",
+            path_to_string_stripping_turbo_fish(&make::path_from_text("Vec::<i32>::new")),
+        );
+        assert_eq!(
+            "Vec::new",
+            path_to_string_stripping_turbo_fish(&make::path_from_text("Vec::new()")),
+        );
+    }
+}