From 297d62d173946e7d2b635de71036002bf87a5f5d Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Sun, 31 Jul 2022 19:57:55 +0200
Subject: [PATCH] Rename parameters for consistency

---
 src/logger.rs     | 14 +++++++-------
 src/store.rs      |  6 +++---
 src/vault/euph.rs | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/logger.rs b/src/logger.rs
index fffe825..67dd490 100644
--- a/src/logger.rs
+++ b/src/logger.rs
@@ -67,23 +67,23 @@ impl MsgStore<LogMsg> for Logger {
         Path::new(vec![*id])
     }
 
-    async fn tree(&self, root: &usize) -> Tree<LogMsg> {
+    async fn tree(&self, tree_id: &usize) -> Tree<LogMsg> {
         let msgs = self
             .messages
             .lock()
-            .get(*root)
+            .get(*tree_id)
             .map(|msg| vec![msg.clone()])
             .unwrap_or_default();
-        Tree::new(*root, msgs)
+        Tree::new(*tree_id, msgs)
     }
 
-    async fn prev_tree_id(&self, tree: &usize) -> Option<usize> {
-        tree.checked_sub(1)
+    async fn prev_tree_id(&self, tree_id: &usize) -> Option<usize> {
+        tree_id.checked_sub(1)
     }
 
-    async fn next_tree_id(&self, tree: &usize) -> Option<usize> {
+    async fn next_tree_id(&self, tree_id: &usize) -> Option<usize> {
         let len = self.messages.lock().len();
-        tree.checked_add(1).filter(|t| *t < len)
+        tree_id.checked_add(1).filter(|t| *t < len)
     }
 
     async fn first_tree_id(&self) -> Option<usize> {
diff --git a/src/store.rs b/src/store.rs
index f400553..ceca76a 100644
--- a/src/store.rs
+++ b/src/store.rs
@@ -141,9 +141,9 @@ impl<M: Msg> Tree<M> {
 #[async_trait]
 pub trait MsgStore<M: Msg> {
     async fn path(&self, id: &M::Id) -> Path<M::Id>;
-    async fn tree(&self, root: &M::Id) -> Tree<M>;
-    async fn prev_tree_id(&self, tree: &M::Id) -> Option<M::Id>;
-    async fn next_tree_id(&self, tree: &M::Id) -> Option<M::Id>;
+    async fn tree(&self, tree_id: &M::Id) -> Tree<M>;
+    async fn prev_tree_id(&self, tree_id: &M::Id) -> Option<M::Id>;
+    async fn next_tree_id(&self, tree_id: &M::Id) -> Option<M::Id>;
     async fn first_tree_id(&self) -> Option<M::Id>;
     async fn last_tree_id(&self) -> Option<M::Id>;
 }
diff --git a/src/vault/euph.rs b/src/vault/euph.rs
index 8ac863c..3a84cf9 100644
--- a/src/vault/euph.rs
+++ b/src/vault/euph.rs
@@ -181,36 +181,36 @@ impl MsgStore<EuphMsg> for EuphVault {
         rx.await.unwrap()
     }
 
-    async fn tree(&self, root: &Snowflake) -> Tree<EuphMsg> {
+    async fn tree(&self, tree_id: &Snowflake) -> Tree<EuphMsg> {
         // TODO vault::Error
         let (tx, rx) = oneshot::channel();
         let request = EuphRequest::GetTree {
             room: self.room.clone(),
-            root: *root,
+            root: *tree_id,
             result: tx,
         };
         let _ = self.vault.tx.send(request.into());
         rx.await.unwrap()
     }
 
-    async fn prev_tree_id(&self, root: &Snowflake) -> Option<Snowflake> {
+    async fn prev_tree_id(&self, tree_id: &Snowflake) -> Option<Snowflake> {
         // TODO vault::Error
         let (tx, rx) = oneshot::channel();
         let request = EuphRequest::GetPrevTreeId {
             room: self.room.clone(),
-            root: *root,
+            root: *tree_id,
             result: tx,
         };
         let _ = self.vault.tx.send(request.into());
         rx.await.unwrap()
     }
 
-    async fn next_tree_id(&self, root: &Snowflake) -> Option<Snowflake> {
+    async fn next_tree_id(&self, tree_id: &Snowflake) -> Option<Snowflake> {
         // TODO vault::Error
         let (tx, rx) = oneshot::channel();
         let request = EuphRequest::GetNextTreeId {
             room: self.room.clone(),
-            root: *root,
+            root: *tree_id,
             result: tx,
         };
         let _ = self.vault.tx.send(request.into());