From 53f9119edd29611bd947da1187619627b59146e6 Mon Sep 17 00:00:00 2001 From: Mroik Date: Sun, 5 Apr 2026 22:51:55 +0200 Subject: Rename stuff to disambiguate Having both the callback and the high level API be called execute() is confusing. Rename for clarity. Signed-off-by: Mroik --- src/list.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/list.rs') diff --git a/src/list.rs b/src/list.rs index 8624650..43a9819 100644 --- a/src/list.rs +++ b/src/list.rs @@ -1,7 +1,7 @@ use anyhow::Result; use rusqlite::fallible_iterator::FallibleIterator; -use crate::database::{DBExecutable, QueryResult}; +use crate::database::{Query, QueryResult}; #[derive(PartialEq, Debug)] struct User { @@ -54,9 +54,9 @@ enum UserQuery<'a> { QueryAll, } -impl DBExecutable for UserQuery<'_> { +impl Query for UserQuery<'_> { type T = User; - fn execute(&self, tx: &rusqlite::Transaction) -> Result> { + fn callback(&self, tx: &rusqlite::Transaction) -> Result> { match self { UserQuery::Insert(name, email) => self.db_insert(tx, name, email), UserQuery::Delete(email) => self.db_delete(tx, email), @@ -163,10 +163,10 @@ enum ListQuery<'a> { QueryAll, } -impl DBExecutable for ListQuery<'_> { +impl Query for ListQuery<'_> { type T = List; - fn execute(&self, tx: &rusqlite::Transaction) -> Result> { + fn callback(&self, tx: &rusqlite::Transaction) -> Result> { match self { ListQuery::Insert(name, desc) => self.db_insert(tx, name, desc), ListQuery::Delete(name) => self.db_delete(tx, name), @@ -249,10 +249,10 @@ enum SubscriptionQuery<'a> { Subscribers(&'a str), } -impl DBExecutable for SubscriptionQuery<'_> { +impl Query for SubscriptionQuery<'_> { type T = SubscriptionResult; - fn execute(&self, tx: &rusqlite::Transaction) -> Result> { + fn callback(&self, tx: &rusqlite::Transaction) -> Result> { match self { SubscriptionQuery::Insert(email, list_name) => self.db_insert(tx, email, list_name), SubscriptionQuery::Count => self.db_query_all(tx), -- cgit v1.3