GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Skip element 0 when rebuilding the working set

Browse source 
The existing code was correct, assuming that element 0 is always None,
but this is clearer.
This commit is contained in:
Dustin J. Mitchell 2021-05-07 22:37:40 +00:00
parent fa7623ebe7
commit 5f6918fbc7
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
taskchampion/src/taskdb.rs
View file

@ -117,14 +117,14 @@ impl TaskDb {
{ {
let mut txn = self.storage.txn()?; let mut txn = self.storage.txn()?;
let mut new_ws = vec![]; let mut new_ws = vec![None]; // index 0 is always None
let mut seen = HashSet::new(); let mut seen = HashSet::new();
// The goal here is for existing working-set items to be "compressed' down to index 1, so // The goal here is for existing working-set items to be "compressed' down to index 1, so
// we begin by scanning the current working set and inserting any tasks that should still // we begin by scanning the current working set and inserting any tasks that should still
// be in the set into new_ws, implicitly dropping any tasks that are no longer in the // be in the set into new_ws, implicitly dropping any tasks that are no longer in the
// working set. // working set.
for elt in txn.get_working_set()? { for elt in txn.get_working_set()?.drain(1..) {
if let Some(uuid) = elt { if let Some(uuid) = elt {
if let Some(task) = txn.get_task(uuid)? { if let Some(task) = txn.get_task(uuid)? {
if in_working_set(&task) { if in_working_set(&task) {
@ -144,12 +144,12 @@ 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 uuid in new_ws.drain(0..new_ws.len()).flatten() { for elt in new_ws.drain(1..new_ws.len()).flatten() {
txn.add_to_working_set(uuid)?; txn.add_to_working_set(elt)?;
} }
} 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
for (i, elt) in new_ws.iter().enumerate() { for (i, elt) in new_ws.iter().enumerate().skip(1) {
if elt.is_none() { if elt.is_none() {
txn.set_working_set_item(i, None)?; txn.set_working_set_item(i, None)?;
} }