gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #239 from taskchampion/fix-new-clippy

Browse Source 
fix new clippy warnings
This commit is contained in:
Dustin J. Mitchell
2021-05-17 21:34:03 -04:00
committed by GitHub
parent cea5ae87c7 cbe11a1d3d
commit 47b3148a38
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
taskchampion/src/taskdb.rs
View File

@@ -144,10 +144,8 @@ impl TaskDb {
// if renumbering, clear the working set and re-add // if renumbering, clear the working set and re-add
if renumber { if renumber {
txn.clear_working_set()?; txn.clear_working_set()?;
for elt in new_ws.drain(0..new_ws.len()) { for uuid in new_ws.drain(0..new_ws.len()).flatten() {
if let Some(uuid) = elt { txn.add_to_working_set(uuid)?;
txn.add_to_working_set(uuid)?;
}
} }
} else { } else {
// ..otherwise, just clear the None items determined above from the working set // ..otherwise, just clear the None items determined above from the working set

8
taskchampion/src/workingset.rs
View File

@@ -58,13 +58,7 @@ impl WorkingSet {
self.by_index self.by_index
.iter() .iter()
.enumerate() .enumerate()
.filter_map(|(index, uuid)| { .filter_map(|(index, uuid)| uuid.as_ref().map(|uuid| (index, *uuid)))
if let Some(uuid) = uuid {
Some((index, *uuid))
} else {
None
}
})
} }
} }