From abb6b8f14c4d05cf344048263651d8192997b6cf Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 8 Mar 2021 20:22:33 +0300 Subject: Use the same name in xtask and test utils --- crates/test_utils/src/bench_fixture.rs | 6 +++--- crates/test_utils/src/lib.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/test_utils') diff --git a/crates/test_utils/src/bench_fixture.rs b/crates/test_utils/src/bench_fixture.rs index d775e2cc9..3a37c4473 100644 --- a/crates/test_utils/src/bench_fixture.rs +++ b/crates/test_utils/src/bench_fixture.rs @@ -4,7 +4,7 @@ use std::fs; use stdx::format_to; -use crate::project_dir; +use crate::project_root; pub fn big_struct() -> String { let n = 1_000; @@ -32,11 +32,11 @@ struct S{} {{ } pub fn glorious_old_parser() -> String { - let path = project_dir().join("bench_data/glorious_old_parser"); + let path = project_root().join("bench_data/glorious_old_parser"); fs::read_to_string(&path).unwrap() } pub fn numerous_macro_rules() -> String { - let path = project_dir().join("bench_data/numerous_macro_rules"); + let path = project_root().join("bench_data/numerous_macro_rules"); fs::read_to_string(&path).unwrap() } diff --git a/crates/test_utils/src/lib.rs b/crates/test_utils/src/lib.rs index 7f122b13e..097a54139 100644 --- a/crates/test_utils/src/lib.rs +++ b/crates/test_utils/src/lib.rs @@ -288,14 +288,14 @@ pub fn skip_slow_tests() -> bool { if should_skip { eprintln!("ignoring slow test") } else { - let path = project_dir().join("./target/.slow_tests_cookie"); + let path = project_root().join("./target/.slow_tests_cookie"); fs::write(&path, ".").unwrap(); } should_skip } /// Returns the path to the root directory of `rust-analyzer` project. -pub fn project_dir() -> PathBuf { +pub fn project_root() -> PathBuf { let dir = env!("CARGO_MANIFEST_DIR"); PathBuf::from(dir).parent().unwrap().parent().unwrap().to_owned() } @@ -371,7 +371,7 @@ pub fn try_ensure_file_contents(file: &Path, contents: &str) -> Result<(), ()> { } _ => (), } - let display_path = file.strip_prefix(&project_dir()).unwrap_or(file); + let display_path = file.strip_prefix(&project_root()).unwrap_or(file); eprintln!( "\n\x1b[31;1merror\x1b[0m: {} was not up-to-date, updating\n", display_path.display() -- cgit v1.2.3