user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rustfmt

Browse source
This commit is contained in:
Felix S. Klock II 2019-02-13 22:31:33 +01:00
parent cfed7c59f4
commit da300fd553
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ra_vfs/src/lib.rs
View file

@ -72,12 +72,12 @@ impl RootConfig {
if self.excluded_dirs.iter().any(|it| path.starts_with(it)) {
return None;
}
let rel_path = path.strip_prefix(&self.root)
let rel_path = path
.strip_prefix(&self.root)
.or_else(|err_payload| {
self.canonical_root
.as_ref()
.map_or(Err(err_payload),
|canonical_root| path.strip_prefix(canonical_root))
.map_or(Err(err_payload), |canonical_root| path.strip_prefix(canonical_root))
})
.ok()?;
let rel_path = RelativePathBuf::from_path(rel_path).ok()?;