forked from Deuxfleurs/garage
Clippy
This commit is contained in:
parent
2d13f0aa13
commit
077dd1cde9
2 changed files with 5 additions and 5 deletions
src/model
|
@ -52,7 +52,8 @@ impl TableSchema for BlockRefTable {
|
|||
type Filter = DeletedFilter;
|
||||
|
||||
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 is_after = new.as_ref().map(|x| !x.deleted.get()).unwrap_or(false);
|
||||
if is_after && !was_before {
|
||||
|
|
|
@ -142,7 +142,8 @@ impl Garage {
|
|||
let key_table = Table::new(KeyTable, control_rep_param, system.clone(), &db);
|
||||
|
||||
info!("Initialize Garage...");
|
||||
let garage = Arc::new(Self {
|
||||
|
||||
Arc::new(Self {
|
||||
config,
|
||||
db,
|
||||
background,
|
||||
|
@ -154,9 +155,7 @@ impl Garage {
|
|||
object_table,
|
||||
version_table,
|
||||
block_ref_table,
|
||||
});
|
||||
|
||||
garage
|
||||
})
|
||||
}
|
||||
|
||||
pub fn bucket_helper(&self) -> helper::bucket::BucketHelper {
|
||||
|
|
Loading…
Reference in a new issue