language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Be more explicit about absolute paths at various places

Browse source
This commit is contained in:
Aleksey Kladov 2020-06-24 13:34:24 +02:00
parent dff62def2e
commit 154cb8243b
11 changed files with 126 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/rust-analyzer/src/global_state.rs
View file

@ -310,11 +310,10 @@ impl ProjectFolders {
let mut file_set_roots: Vec<VfsPath> = vec![];
let path = AbsPathBuf::try_from(path).unwrap();
let entry = if root.is_member() {
vfs::loader::Entry::local_cargo_package(path.clone())
vfs::loader::Entry::local_cargo_package(path.to_path_buf())
} else {
vfs::loader::Entry::cargo_package_dependency(path.clone())
vfs::loader::Entry::cargo_package_dependency(path.to_path_buf())
};
res.load.push(entry);
if root.is_member() {
@ -329,7 +328,7 @@ impl ProjectFolders {
}
file_set_roots.push(out_dir.into());
}
file_set_roots.push(path.into());
file_set_roots.push(path.to_path_buf().into());
if root.is_member() {
local_filesets.push(fsc.len());