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.rs10
1 files changed, 4 insertions, 6 deletions
diff --git a/crates/project-model/src/tests.rs b/crates/project-model/src/tests.rs
index ed72520f40..711cdd11b9 100644
--- a/crates/project-model/src/tests.rs
+++ b/crates/project-model/src/tests.rs
@@ -9,7 +9,6 @@ use paths::{AbsPath, AbsPathBuf, Utf8Path, Utf8PathBuf};
use rustc_hash::FxHashMap;
use serde::de::DeserializeOwned;
use span::FileId;
-use triomphe::Arc;
use crate::{
CargoWorkspace, CfgOverrides, ManifestPath, ProjectJson, ProjectJsonData, ProjectWorkspace,
@@ -47,7 +46,7 @@ fn load_workspace_from_metadata(file: &str) -> ProjectWorkspace {
sysroot: Sysroot::empty(),
rustc_cfg: Vec::new(),
toolchain: None,
- target_layout: Err("target_data_layout not loaded".into()),
+ target: Err("target_data_layout not loaded".into()),
extra_includes: Vec::new(),
set_test: true,
}
@@ -62,7 +61,7 @@ fn load_rust_project(file: &str) -> (CrateGraphBuilder, ProcMacroPaths) {
sysroot,
rustc_cfg: Vec::new(),
toolchain: None,
- target_layout: Err(Arc::from("test has no data layout")),
+ target: Err("test has no target data".into()),
cfg_overrides: Default::default(),
extra_includes: Vec::new(),
set_test: true,
@@ -242,7 +241,6 @@ fn smoke_test_real_sysroot_cargo() {
let loaded_sysroot = sysroot.load_workspace(
&RustSourceWorkspaceConfig::default_cargo(),
false,
- &cwd,
&Utf8PathBuf::default(),
&|_| (),
);
@@ -250,7 +248,7 @@ fn smoke_test_real_sysroot_cargo() {
sysroot.set_workspace(loaded_sysroot);
}
assert!(
- matches!(sysroot.workspace(), RustLibSrcWorkspace::Workspace(_)),
+ matches!(sysroot.workspace(), RustLibSrcWorkspace::Workspace { .. }),
"got {}",
sysroot.workspace()
);
@@ -265,7 +263,7 @@ fn smoke_test_real_sysroot_cargo() {
rustc_cfg: Vec::new(),
cfg_overrides: Default::default(),
toolchain: None,
- target_layout: Err("target_data_layout not loaded".into()),
+ target: Err("target_data_layout not loaded".into()),
extra_includes: Vec::new(),
set_test: true,
};