diff options
| author | Jonas Schievink <[email protected]> | 2020-06-26 15:25:08 +0100 |
|---|---|---|
| committer | Jonas Schievink <[email protected]> | 2020-06-26 15:30:50 +0100 |
| commit | 72fe70f2f8aee9556166ba0f984a29d19a485e61 (patch) | |
| tree | dd41903d8f15ea095a46fa52c0f0b23eed73a802 /crates/vfs/src/file_set.rs | |
| parent | 38cd1b70e8d4b8f57ac2ae0702cf4728764094d9 (diff) | |
Make VFS join methods fallible
Diffstat (limited to 'crates/vfs/src/file_set.rs')
| -rw-r--r-- | crates/vfs/src/file_set.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/vfs/src/file_set.rs b/crates/vfs/src/file_set.rs index 0173f7464..d0ddeafe7 100644 --- a/crates/vfs/src/file_set.rs +++ b/crates/vfs/src/file_set.rs | |||
| @@ -18,7 +18,7 @@ impl FileSet { | |||
| 18 | pub fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> { | 18 | pub fn resolve_path(&self, anchor: FileId, path: &str) -> Option<FileId> { |
| 19 | let mut base = self.paths[&anchor].clone(); | 19 | let mut base = self.paths[&anchor].clone(); |
| 20 | base.pop(); | 20 | base.pop(); |
| 21 | let path = base.join(path); | 21 | let path = base.join(path)?; |
| 22 | let res = self.files.get(&path).copied(); | 22 | let res = self.files.get(&path).copied(); |
| 23 | res | 23 | res |
| 24 | } | 24 | } |