diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-24 15:25:56 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-06-24 15:25:56 +0100 |
| commit | 1a3b507a007d0373a83bde203d780b860ea55ce1 (patch) | |
| tree | fd9b9d3295963b17f65d2a0960189adeae38c3a2 /crates/vfs | |
| parent | 97c4d06258bace7c9caf211d3a307fff05bdb58e (diff) | |
| parent | e6c61d5072e600372ba4a38ad8893af37aaa77e6 (diff) | |
Merge #5034
5034: Cleanup project.json deserialization r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/vfs')
| -rw-r--r-- | crates/vfs/src/loader.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/vfs/src/loader.rs b/crates/vfs/src/loader.rs index a216b5f13..052803dd9 100644 --- a/crates/vfs/src/loader.rs +++ b/crates/vfs/src/loader.rs | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | //! Object safe interface for file watching and reading. | 1 | //! Object safe interface for file watching and reading. |
| 2 | use std::fmt; | 2 | use std::fmt; |
| 3 | 3 | ||
| 4 | use paths::AbsPathBuf; | 4 | use paths::{AbsPath, AbsPathBuf}; |
| 5 | 5 | ||
| 6 | #[derive(Debug)] | 6 | #[derive(Debug)] |
| 7 | pub enum Entry { | 7 | pub enum Entry { |
| @@ -28,7 +28,7 @@ pub trait Handle: fmt::Debug { | |||
| 28 | Self: Sized; | 28 | Self: Sized; |
| 29 | fn set_config(&mut self, config: Config); | 29 | fn set_config(&mut self, config: Config); |
| 30 | fn invalidate(&mut self, path: AbsPathBuf); | 30 | fn invalidate(&mut self, path: AbsPathBuf); |
| 31 | fn load_sync(&mut self, path: &AbsPathBuf) -> Option<Vec<u8>>; | 31 | fn load_sync(&mut self, path: &AbsPath) -> Option<Vec<u8>>; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | impl Entry { | 34 | impl Entry { |