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/rust-analyzer/src/global_state.rs | |
| parent | 38cd1b70e8d4b8f57ac2ae0702cf4728764094d9 (diff) | |
Make VFS join methods fallible
Diffstat (limited to 'crates/rust-analyzer/src/global_state.rs')
| -rw-r--r-- | crates/rust-analyzer/src/global_state.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/rust-analyzer/src/global_state.rs b/crates/rust-analyzer/src/global_state.rs index 7533bb319..28daec5a3 100644 --- a/crates/rust-analyzer/src/global_state.rs +++ b/crates/rust-analyzer/src/global_state.rs | |||
| @@ -213,7 +213,7 @@ impl GlobalStateSnapshot { | |||
| 213 | pub(crate) fn anchored_path(&self, file_id: FileId, path: &str) -> Url { | 213 | pub(crate) fn anchored_path(&self, file_id: FileId, path: &str) -> Url { |
| 214 | let mut base = self.vfs.read().0.file_path(file_id); | 214 | let mut base = self.vfs.read().0.file_path(file_id); |
| 215 | base.pop(); | 215 | base.pop(); |
| 216 | let path = base.join(path); | 216 | let path = base.join(path).unwrap(); |
| 217 | let path = path.as_path().unwrap(); | 217 | let path = path.as_path().unwrap(); |
| 218 | url_from_abs_path(&path) | 218 | url_from_abs_path(&path) |
| 219 | } | 219 | } |