drain remove

apfitzge · Aug 9, 2024 · 8530a27 · 8530a27
1 parent 88ffad0
commit 8530a27
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/lock.rs b/src/lock.rs
@@ -44,9 +44,10 @@ impl<Id: TransactionId> Lock<Id> {
                     return;
                 }
 
-                for id in self.current_locks.drain(..) {
-                    conflict_callback(&id);
-                }
+                // Only single lock, so call on the conflict and
+                // clear the current lock.
+                conflict_callback(&current_write_id);
+                self.current_locks.clear();
                 self.kind = AccessKind::Read;
                 self.current_locks.push(id);
                 self.most_recent_write = Some(current_write_id);
@@ -73,9 +74,11 @@ impl<Id: TransactionId> Lock<Id> {
                     return;
                 }
 
-                for id in self.current_locks.drain(..) {
-                    conflict_callback(&id);
-                }
+                // Only single lock, so call on the conflict and
+                // clear the current lock.
+                conflict_callback(&current_write_id);
+                self.current_locks.clear();
+
                 self.current_locks.push(id);
             }
         }