diff options
author | Alex <alex@adnab.me> | 2023-01-26 21:10:21 +0000 |
---|---|---|
committer | Alex <alex@adnab.me> | 2023-01-26 21:10:21 +0000 |
commit | f2c256cac4e599335d592dd580011cf15f278a51 (patch) | |
tree | 8a7e90cf4bcf40ef7513e9ffaa636a012ebcc4a9 /src/block | |
parent | a08e01f17a9e4bb80880e28a4a28b2d88a9aec83 (diff) | |
parent | d6af95d20520eec64e5e4c0c873c6e3a8ac1509d (diff) | |
download | garage-f2c256cac4e599335d592dd580011cf15f278a51.tar.gz garage-f2c256cac4e599335d592dd580011cf15f278a51.zip |
Merge pull request 'Many clippy lints fixed' (#488) from k2v-watch-range-2 into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/488
Diffstat (limited to 'src/block')
-rw-r--r-- | src/block/metrics.rs | 2 | ||||
-rw-r--r-- | src/block/rc.rs | 14 | ||||
-rw-r--r-- | src/block/repair.rs | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/block/metrics.rs b/src/block/metrics.rs index 500022fc..6659df32 100644 --- a/src/block/metrics.rs +++ b/src/block/metrics.rs @@ -38,7 +38,7 @@ impl BlockManagerMetrics { .u64_value_observer("block.compression_level", move |observer| { match compression_level { Some(v) => observer.observe(v as u64, &[]), - None => observer.observe(0 as u64, &[]), + None => observer.observe(0_u64, &[]), } }) .with_description("Garage compression level for node") diff --git a/src/block/rc.rs b/src/block/rc.rs index 8dae3960..94cb5eea 100644 --- a/src/block/rc.rs +++ b/src/block/rc.rs @@ -24,9 +24,9 @@ impl BlockRc { tx: &mut db::Transaction, hash: &Hash, ) -> db::TxOpResult<bool> { - let old_rc = RcEntry::parse_opt(tx.get(&self.rc, &hash)?); + let old_rc = RcEntry::parse_opt(tx.get(&self.rc, hash)?); match old_rc.increment().serialize() { - Some(x) => tx.insert(&self.rc, &hash, x)?, + Some(x) => tx.insert(&self.rc, hash, x)?, None => unreachable!(), }; Ok(old_rc.is_zero()) @@ -39,10 +39,10 @@ impl BlockRc { tx: &mut db::Transaction, hash: &Hash, ) -> db::TxOpResult<bool> { - let new_rc = RcEntry::parse_opt(tx.get(&self.rc, &hash)?).decrement(); + let new_rc = RcEntry::parse_opt(tx.get(&self.rc, hash)?).decrement(); match new_rc.serialize() { - Some(x) => tx.insert(&self.rc, &hash, x)?, - None => tx.remove(&self.rc, &hash)?, + Some(x) => tx.insert(&self.rc, hash, x)?, + None => tx.remove(&self.rc, hash)?, }; Ok(matches!(new_rc, RcEntry::Deletable { .. })) } @@ -57,10 +57,10 @@ impl BlockRc { pub(crate) fn clear_deleted_block_rc(&self, hash: &Hash) -> Result<(), Error> { let now = now_msec(); self.rc.db().transaction(|mut tx| { - let rcval = RcEntry::parse_opt(tx.get(&self.rc, &hash)?); + let rcval = RcEntry::parse_opt(tx.get(&self.rc, hash)?); match rcval { RcEntry::Deletable { at_time } if now > at_time => { - tx.remove(&self.rc, &hash)?; + tx.remove(&self.rc, hash)?; } _ => (), }; diff --git a/src/block/repair.rs b/src/block/repair.rs index 064cc005..d4593dbf 100644 --- a/src/block/repair.rs +++ b/src/block/repair.rs @@ -466,11 +466,11 @@ impl BlockStoreIterator { let ent_type = data_dir_ent.file_type().await?; let name = name.strip_suffix(".zst").unwrap_or(&name); - if name.len() == 2 && hex::decode(&name).is_ok() && ent_type.is_dir() { + if name.len() == 2 && hex::decode(name).is_ok() && ent_type.is_dir() { let path = data_dir_ent.path(); self.path.push(ReadingDir::Pending(path)); } else if name.len() == 64 { - if let Ok(h) = hex::decode(&name) { + if let Ok(h) = hex::decode(name) { let mut hash = [0u8; 32]; hash.copy_from_slice(&h); return Ok(Some(hash.into())); |