Chore: use short-circuiting for file ID getter

BastiDood · BastiDood · commit e912d6507f38 · 2021-08-10T15:43:51.000+08:00
diff --git a/crates/vfs/src/lib.rs b/crates/vfs/src/lib.rs
@@ -111,7 +111,9 @@ impl Vfs {
 
     /// Id of the given path if it exists in the `Vfs` and is not deleted.
     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`.

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,9 @@ impl Vfs {`
`111`	`111`
`112`	`112`	/// Id of the given path if it exists in the `Vfs` and is not deleted.
`113`	`113`	`pub fn file_id(&self, path: &VfsPath) -> Option<FileId> {`
`114`		`- self.interner.get(path).filter(\|&it\| self.get(it).is_some())`
	`114`	`+ let it = self.interner.get(path)?;`
	`115`	`+ let _ = self.get(it).as_ref()?;`
	`116`	`+ Some(it)`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	/// File path corresponding to the given `file_id`.