diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-26 15:37:15 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-06-26 15:37:15 +0100 |
commit | 4f60b4f2a32190830215defe6cf81836f34d99c9 (patch) | |
tree | 008a5cf106fd62a65b1931cf340cf058a838be5d /crates/vfs/src/file_set.rs | |
parent | ce06f8d0416d5851264769eb9583ce43d66f0474 (diff) | |
parent | 72fe70f2f8aee9556166ba0f984a29d19a485e61 (diff) |
Merge #5076
5076: Make VFS join methods fallible r=matklad a=jonas-schievink
Co-authored-by: Jonas Schievink <[email protected]>
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 | } |