From e42c7bed386f604b5beeb0a4330defacff059233 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Mon, 6 Jun 2022 17:06:22 +0200 Subject: Remove useless clones in sqlite --- src/db/sqlite_adapter.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/db/sqlite_adapter.rs b/src/db/sqlite_adapter.rs index f0bca257..0c8a0746 100644 --- a/src/db/sqlite_adapter.rs +++ b/src/db/sqlite_adapter.rs @@ -48,10 +48,10 @@ impl SqliteDb { } impl SqliteDbInner { - fn get_tree(&self, i: usize) -> Result { + fn get_tree(&self, i: usize) -> Result<&'_ str> { self.trees .get(i) - .cloned() + .map(String::as_str) .ok_or_else(|| Error("invalid tree id".into())) } } @@ -269,8 +269,8 @@ struct SqliteTx<'a> { } impl<'a> SqliteTx<'a> { - fn get_tree(&self, i: usize) -> Result { - self.trees.get(i).cloned().ok_or_else(|| { + fn get_tree(&self, i: usize) -> Result<&'_ str> { + self.trees.get(i).map(String::as_ref).ok_or_else(|| { Error( "invalid tree id (it might have been openned after the transaction started)".into(), ) -- cgit v1.2.3