bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/project-model/src/tests.rs')
-rw-r--r--crates/project-model/src/tests.rs32
1 files changed, 3 insertions, 29 deletions
diff --git a/crates/project-model/src/tests.rs b/crates/project-model/src/tests.rs
index ef7b334064..1faa7b81e4 100644
--- a/crates/project-model/src/tests.rs
+++ b/crates/project-model/src/tests.rs
@@ -33,7 +33,7 @@ fn load_workspace_from_metadata(file: &str) -> ProjectWorkspace {
let meta: Metadata = get_test_json_file(file);
let manifest_path =
ManifestPath::try_from(AbsPathBuf::try_from(meta.workspace_root.clone()).unwrap()).unwrap();
- let cargo_workspace = CargoWorkspace::new(meta, manifest_path, Default::default());
+ let cargo_workspace = CargoWorkspace::new(meta, manifest_path, Default::default(), false);
ProjectWorkspace {
kind: ProjectWorkspaceKind::Cargo {
cargo: cargo_workspace,
@@ -54,7 +54,7 @@ fn load_workspace_from_metadata(file: &str) -> ProjectWorkspace {
fn load_rust_project(file: &str) -> (CrateGraphBuilder, ProcMacroPaths) {
let data = get_test_json_file(file);
let project = rooted_project_json(data);
- let sysroot = get_fake_sysroot();
+ let sysroot = Sysroot::empty();
let project_workspace = ProjectWorkspace {
kind: ProjectWorkspaceKind::Json(project),
sysroot,
@@ -101,36 +101,11 @@ fn replace_root(s: &mut String, direction: bool) {
}
}
-fn replace_fake_sys_root(s: &mut String) {
- let fake_sysroot_path = get_test_path("fake-sysroot");
- let fake_sysroot_path = if cfg!(windows) {
- let normalized_path = fake_sysroot_path.as_str().replace('\\', r#"\\"#);
- format!(r#"{normalized_path}\\"#)
- } else {
- format!("{}/", fake_sysroot_path.as_str())
- };
- *s = s.replace(&fake_sysroot_path, "$FAKESYSROOT$")
-}
-
fn get_test_path(file: &str) -> Utf8PathBuf {
let base = Utf8PathBuf::from(env!("CARGO_MANIFEST_DIR"));
base.join("test_data").join(file)
}
-fn get_fake_sysroot() -> Sysroot {
- let sysroot_path = get_test_path("fake-sysroot");
- // there's no `libexec/` directory with a `proc-macro-srv` binary in that
- // fake sysroot, so we give them both the same path:
- let sysroot_dir = AbsPathBuf::assert(sysroot_path);
- let sysroot_src_dir = sysroot_dir.clone();
- let mut sysroot = Sysroot::new(Some(sysroot_dir), Some(sysroot_src_dir));
- let loaded_sysroot = sysroot.load_workspace(&RustSourceWorkspaceConfig::default_cargo());
- if let Some(loaded_sysroot) = loaded_sysroot {
- sysroot.set_workspace(loaded_sysroot);
- }
- sysroot
-}
-
fn rooted_project_json(data: ProjectJsonData) -> ProjectJson {
let mut root = "$ROOT$".to_owned();
replace_root(&mut root, true);
@@ -159,7 +134,6 @@ fn check_crate_graph(crate_graph: CrateGraphBuilder, expect: ExpectFile) {
replace_root(&mut crate_graph, false);
replace_cargo(&mut crate_graph);
- replace_fake_sys_root(&mut crate_graph);
expect.assert_eq(&crate_graph);
}
@@ -256,7 +230,7 @@ fn smoke_test_real_sysroot_cargo() {
let meta: Metadata = get_test_json_file("hello-world-metadata.json");
let manifest_path =
ManifestPath::try_from(AbsPathBuf::try_from(meta.workspace_root.clone()).unwrap()).unwrap();
- let cargo_workspace = CargoWorkspace::new(meta, manifest_path, Default::default());
+ let cargo_workspace = CargoWorkspace::new(meta, manifest_path, Default::default(), false);
let mut sysroot = Sysroot::discover(
AbsPath::assert(Utf8Path::new(env!("CARGO_MANIFEST_DIR"))),
&Default::default(),