From e9fd265ce6d326425994ccfea9d5afc7165460db Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 20 Nov 2020 20:11:04 +0100
Subject: Slight refactoring to make things clearer with DeletedFilter

---
 src/model/object_table.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/model/object_table.rs')

diff --git a/src/model/object_table.rs b/src/model/object_table.rs
index 719a222c..929b63f0 100644
--- a/src/model/object_table.rs
+++ b/src/model/object_table.rs
@@ -196,7 +196,7 @@ impl TableSchema for ObjectTable {
 	type P = String;
 	type S = String;
 	type E = Object;
-	type Filter = ();
+	type Filter = DeletedFilter;
 
 	async fn updated(&self, old: Option<Self::E>, new: Option<Self::E>) -> Result<(), Error> {
 		let version_table = self.version_table.clone();
@@ -228,8 +228,9 @@ impl TableSchema for ObjectTable {
 		Ok(())
 	}
 
-	fn matches_filter(entry: &Self::E, _filter: &Self::Filter) -> bool {
-		entry.versions.iter().any(|v| v.is_data())
+	fn matches_filter(entry: &Self::E, filter: &Self::Filter) -> bool {
+		let deleted = !entry.versions.iter().any(|v| v.is_data());
+		filter.apply(deleted)
 	}
 
 	fn try_migrate(bytes: &[u8]) -> Option<Self::E> {
-- 
cgit v1.2.3