Deuxfleurs/garage
43
56
Fork 74
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Clippy
All checks were successful
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Alex 2022-03-15 16:06:50 +01:00
parent 23cf71a483
commit eb0b3bd473
Signed by: lx
GPG key ID: 0E496D15096376BE
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/model/block_ref_table.rs
View file

@ -52,7 +52,8 @@ impl TableSchema for BlockRefTable {
type Filter = DeletedFilter; type Filter = DeletedFilter;
fn updated(&self, old: Option<Self::E>, new: Option<Self::E>) { fn updated(&self, old: Option<Self::E>, new: Option<Self::E>) {
let block = &old.as_ref().or_else(|| new.as_ref()).unwrap().block; #[allow(clippy::or_fun_call)]
let block = &old.as_ref().or(new.as_ref()).unwrap().block;
let was_before = old.as_ref().map(|x| !x.deleted.get()).unwrap_or(false); let was_before = old.as_ref().map(|x| !x.deleted.get()).unwrap_or(false);
let is_after = new.as_ref().map(|x| !x.deleted.get()).unwrap_or(false); let is_after = new.as_ref().map(|x| !x.deleted.get()).unwrap_or(false);
if is_after && !was_before { if is_after && !was_before {

7
src/model/garage.rs
View file

@ -142,7 +142,8 @@ impl Garage {
let key_table = Table::new(KeyTable, control_rep_param, system.clone(), &db); let key_table = Table::new(KeyTable, control_rep_param, system.clone(), &db);
info!("Initialize Garage..."); info!("Initialize Garage...");
let garage = Arc::new(Self {
Arc::new(Self {
config, config,
db, db,
background, background,
@ -154,9 +155,7 @@ impl Garage {
object_table, object_table,
version_table, version_table,
block_ref_table, block_ref_table,
}); })
garage
} }
pub fn bucket_helper(&self) -> helper::bucket::BucketHelper { pub fn bucket_helper(&self) -> helper::bucket::BucketHelper {