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

Refactor: use filter_map when iterating over stored IDs and

Browse Source
This commit is contained in:
Basti Ortiz
2021-08-10 15:56:16 +08:00
parent e912d6507f
commit 0765c9713b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,12 +139,11 @@ impl Vfs {
/// ///
/// This will skip deleted files. /// This will skip deleted files.
pub fn iter(&self) -> impl Iterator<Item = (FileId, &VfsPath)> + '_ { pub fn iter(&self) -> impl Iterator<Item = (FileId, &VfsPath)> + '_ {
(0..self.data.len()) (0..self.data.len()).filter_map(move |it| {
.map(|it| FileId(it as u32)) let file_id = FileId(it as u32);
.filter(move |&file_id| self.get(file_id).is_some()) let _ = self.get(file_id).as_ref()?;
.map(move |file_id| {
let path = self.interner.lookup(file_id); let path = self.interner.lookup(file_id);
(file_id, path) Some((file_id, path))
}) })
} }