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/model/k2v/seen.rs | |
| 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/model/k2v/seen.rs')
| -rw-r--r-- | src/model/k2v/seen.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/model/k2v/seen.rs b/src/model/k2v/seen.rs index 51098710..8fe3a582 100644 --- a/src/model/k2v/seen.rs +++ b/src/model/k2v/seen.rs @@ -63,7 +63,7 @@ impl RangeSeenMarker { None => { self.items.insert(item.sort_key.clone(), cc.vector_clock); } - Some(ent) => *ent = vclock_max(&ent, &cc.vector_clock), + Some(ent) => *ent = vclock_max(ent, &cc.vector_clock), } } } @@ -71,7 +71,7 @@ impl RangeSeenMarker { pub fn canonicalize(&mut self) { let self_vc = &self.vector_clock; - self.items.retain(|_sk, vc| vclock_gt(&vc, self_vc)) + self.items.retain(|_sk, vc| vclock_gt(vc, self_vc)) } pub fn encode(&mut self) -> Result<String, Error> { @@ -84,7 +84,7 @@ impl RangeSeenMarker { /// Decode from msgpack+zstd+b64 representation, returns None on error. pub fn decode(s: &str) -> Option<Self> { - let bytes = BASE64_STANDARD.decode(&s).ok()?; + let bytes = BASE64_STANDARD.decode(s).ok()?; let bytes = zstd::stream::decode_all(&mut &bytes[..]).ok()?; nonversioned_decode(&bytes).ok() } @@ -99,7 +99,7 @@ impl RangeSeenMarker { && self .items .get(&item.sort_key) - .map(|vc| vclock_gt(&cc.vector_clock, &vc)) + .map(|vc| vclock_gt(&cc.vector_clock, vc)) .unwrap_or(true) } } |