rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Chore: use short-circuiting for file ID getter

Browse Source
This commit is contained in:
Basti Ortiz
2021-08-10 15:43:51 +08:00
parent 8e4fb4f518
commit e912d6507f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/vfs/src/lib.rs
View File

@@ -111,7 +111,9 @@ impl Vfs {
/// Id of the given path if it exists in the `Vfs` and is not deleted. /// Id of the given path if it exists in the `Vfs` and is not deleted.
pub fn file_id(&self, path: &VfsPath) -> Option<FileId> { pub fn file_id(&self, path: &VfsPath) -> Option<FileId> {
self.interner.get(path).filter(|&it| self.get(it).is_some()) let it = self.interner.get(path)?;
let _ = self.get(it).as_ref()?;
Some(it)
} }
/// File path corresponding to the given `file_id`. /// File path corresponding to the given `file_id`.