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

Remove RelativePathBuf from fixture

Browse source 
The paths in fixture are not really relative (the default one is
`/main.rs`), so it doesn't make sense to use `RelativePathBuf` here.
This commit is contained in:
Aleksey Kladov 2020-06-22 17:30:23 +02:00
parent 5a0331e557
commit 6a6098d4c3
9 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_db/src/fixture.rs
View file

@ -164,7 +164,7 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option<FilePosit
let mut source_root = SourceRoot::new_local();
let mut source_root_id = WORKSPACE;
let mut source_root_prefix: RelativePathBuf = "/".into();
let mut source_root_prefix = "/".to_string();
let mut file_id = FileId(0);
let mut file_position = None;
@ -212,9 +212,9 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option<FilePosit
};
db.set_file_text(file_id, Arc::new(text));
db.set_file_relative_path(file_id, meta.path.clone());
db.set_file_relative_path(file_id, meta.path.clone().into());
db.set_file_source_root(file_id, source_root_id);
source_root.insert_file(meta.path, file_id);
source_root.insert_file(meta.path.into(), file_id);
file_id.0 += 1;
}
@ -245,12 +245,12 @@ fn with_files(db: &mut dyn SourceDatabaseExt, fixture: &str) -> Option<FilePosit
}
enum ParsedMeta {
Root { path: RelativePathBuf },
Root { path: String },
File(FileMeta),
}
struct FileMeta {
path: RelativePathBuf,
path: String,
krate: Option<String>,
deps: Vec<String>,
cfg: CfgOptions,