mirrors/conduwuit
1
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2025-12-16 20:29:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve couple pedantic clippy lints, remove unnecessary qualifications

Browse source 
Signed-off-by: strawberry <strawberry@puppygock.gay>
This commit is contained in:
strawberry 2024-03-22 21:51:21 -04:00 • committed by June
parent 6d7ef80aba
commit 9d0b647911
35 changed files with 127 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/database/abstraction/rocksdb.rs
View file

@ -264,7 +264,7 @@ impl KeyValueDatabaseEngine for Arc<Engine> {
if self.config.database_backups_to_keep >= 0 {
let keep = u32::try_from(self.config.database_backups_to_keep)?;
if let Err(e) = engine.purge_old_backups(keep.try_into()?) {
error!("Failed to purge old backup: {:?}", e.to_string())
error!("Failed to purge old backup: {:?}", e.to_string());
}
}
@ -398,7 +398,7 @@ impl KvTree for RocksDbEngineTree<'_> {
self.db
.rocks
.iterator_cf_opt(&self.cf(), readoptions, rust_rocksdb::IteratorMode::Start)
.map(std::result::Result::unwrap)
.map(Result::unwrap)
.map(|(k, v)| (Vec::from(k), Vec::from(v))),
)
}
@ -422,7 +422,7 @@ impl KvTree for RocksDbEngineTree<'_> {
},
),
)
.map(std::result::Result::unwrap)
.map(Result::unwrap)
.map(|(k, v)| (Vec::from(k), Vec::from(v))),
)
}
@ -485,7 +485,7 @@ impl KvTree for RocksDbEngineTree<'_> {
readoptions,
rust_rocksdb::IteratorMode::From(&prefix, rust_rocksdb::Direction::Forward),
)
.map(std::result::Result::unwrap)
.map(Result::unwrap)
.map(|(k, v)| (Vec::from(k), Vec::from(v)))
.take_while(move |(k, _)| k.starts_with(&prefix)),
)

9
src/database/abstraction/sqlite.rs
View file

@ -161,10 +161,7 @@ impl SqliteTable {
//let name = self.name.clone();
let iterator = Box::new(
statement
.query_map([], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
.unwrap()
.map(std::result::Result::unwrap),
statement.query_map([], |row| Ok((row.get_unwrap(0), row.get_unwrap(1)))).unwrap().map(Result::unwrap),
);
Box::new(PreparedStatementIterator {
@ -251,7 +248,7 @@ impl KvTree for SqliteTable {
statement
.query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
.unwrap()
.map(std::result::Result::unwrap),
.map(Result::unwrap),
);
Box::new(PreparedStatementIterator {
iterator,
@ -273,7 +270,7 @@ impl KvTree for SqliteTable {
statement
.query_map([from], |row| Ok((row.get_unwrap(0), row.get_unwrap(1))))
.unwrap()
.map(std::result::Result::unwrap),
.map(Result::unwrap),
);
Box::new(PreparedStatementIterator {