nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-30 02:33:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tests on windows

Browse Source
This commit is contained in:
Aleksey Kladov 2018-09-05 15:03:27 +01:00
parent f87771092c
commit 649f7faf7d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
crates/libanalysis/tests/tests.rs
View File

@ -28,11 +28,18 @@ impl FileResolver for FileMap {
self.path(id).file_stem().unwrap().to_str().unwrap().to_string()
}
fn resolve(&self, id: FileId, rel: &RelativePath) -> Option<FileId> {
let path = rel.to_path(self.path(id));
let path = path.to_str().unwrap();
let path = RelativePath::new(&path[1..]).normalize();
let path = {
if rel.starts_with("..") {
rel.strip_prefix("..").unwrap()
.to_path(&self.path(id).parent().unwrap())
} else {
rel.to_path(self.path(id))
}
};
let path = &path.to_str().unwrap()[1..];
let path = RelativePath::new(&path[0..]).normalize();
let &(id, _) = self.0.iter()
.find(|it| path == RelativePath::new(&it.1[1..]).normalize())?;
.find(|it| path == RelativePath::new(&it.1[0..]).normalize())?;
Some(FileId(id))
}
}