From b9cdf3d85e0ef28cf89a1a307a984879ba604511 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Sat, 24 Dec 2022 12:36:54 +0000
Subject: String cache

---
 rust/src/tree_cache/mod.rs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'rust/src/tree_cache/mod.rs')

diff --git a/rust/src/tree_cache/mod.rs b/rust/src/tree_cache/mod.rs
index 0a4905b881..719d0b2cf9 100644
--- a/rust/src/tree_cache/mod.rs
+++ b/rust/src/tree_cache/mod.rs
@@ -1,4 +1,4 @@
-use std::{collections::HashMap, hash::Hash};
+use std::{borrow::Borrow, collections::HashMap, hash::Hash};
 
 use anyhow::{bail, Error};
 
@@ -141,17 +141,21 @@ impl<'a, K: Eq + Hash + 'a, V> TreeCache<K, V> {
         Ok(())
     }
 
-    pub fn get_node(
+    pub fn get_node<Q>(
         &self,
-        key: impl IntoIterator<Item = &'a K>,
-    ) -> Result<Option<&TreeCacheNode<K, V>>, Error> {
+        key: impl IntoIterator<Item = Q>,
+    ) -> Result<Option<&TreeCacheNode<K, V>>, Error>
+    where
+        Q: Borrow<K>,
+        Q: Hash + Eq + 'a,
+    {
         let mut node = &self.root;
 
         for k in key {
             match node {
                 TreeCacheNode::Leaf(_) => bail!("Given key is too long"),
                 TreeCacheNode::Branch(_, map) => {
-                    node = if let Some(node) = map.get(k) {
+                    node = if let Some(node) = map.get(k.borrow()) {
                         node
                     } else {
                         return Ok(None);
@@ -163,7 +167,11 @@ impl<'a, K: Eq + Hash + 'a, V> TreeCache<K, V> {
         Ok(Some(node))
     }
 
-    pub fn get(&self, key: impl IntoIterator<Item = &'a K>) -> Result<Option<&V>, Error> {
+    pub fn get<Q>(&self, key: impl IntoIterator<Item = Q>) -> Result<Option<&V>, Error>
+    where
+        Q: Borrow<K>,
+        Q: Hash + Eq + 'a,
+    {
         if let Some(node) = self.get_node(key)? {
             match node {
                 TreeCacheNode::Leaf(value) => Ok(Some(value)),
-- 
cgit 1.5.1