Deuxfleurs/garage
44
56
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

Remove useless clones in sqlite
Some checks failed
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/pr Build is failing
Details

Browse source
This commit is contained in:
Alex 2022-06-06 17:06:22 +02:00
parent 1f9a371b9a
commit e42c7bed38
Signed by: lx
GPG key ID: 0E496D15096376BE
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/db/sqlite_adapter.rs
View file

@ -48,10 +48,10 @@ impl SqliteDb {
}
impl SqliteDbInner {
fn get_tree(&self, i: usize) -> Result<String> {
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<String> {
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(),
)