diff options
| author | Alex Auvolat <alex@adnab.me> | 2021-10-26 10:20:05 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2021-10-26 10:20:05 +0200 |
| commit | ada7899b24cacb4f95ee67ae92ddb73c04ee4d66 (patch) | |
| tree | e42c200cd5eb9e9190232d4340f5be27f302342c /src/table/crdt/lww_map.rs | |
| parent | b2c51844a1dccf229473ce0c27fdb02a433ac243 (diff) | |
| download | garage-ada7899b24cacb4f95ee67ae92ddb73c04ee4d66.tar.gz garage-ada7899b24cacb4f95ee67ae92ddb73c04ee4d66.zip | |
Fix clippy lints (fix #121)
Diffstat (limited to 'src/table/crdt/lww_map.rs')
| -rw-r--r-- | src/table/crdt/lww_map.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/table/crdt/lww_map.rs b/src/table/crdt/lww_map.rs index 36bbf667..fb25fd46 100644 --- a/src/table/crdt/lww_map.rs +++ b/src/table/crdt/lww_map.rs @@ -103,7 +103,7 @@ where } /// Get a reference to the value assigned to a key pub fn get(&self, k: &K) -> Option<&V> { - match self.vals.binary_search_by(|(k2, _, _)| k2.cmp(&k)) { + match self.vals.binary_search_by(|(k2, _, _)| k2.cmp(k)) { Ok(i) => Some(&self.vals[i].2), Err(_) => None, } @@ -132,14 +132,14 @@ where { fn merge(&mut self, other: &Self) { for (k, ts2, v2) in other.vals.iter() { - match self.vals.binary_search_by(|(k2, _, _)| k2.cmp(&k)) { + match self.vals.binary_search_by(|(k2, _, _)| k2.cmp(k)) { Ok(i) => { let (_, ts1, _v1) = &self.vals[i]; if ts2 > ts1 { self.vals[i].1 = *ts2; self.vals[i].2 = v2.clone(); } else if ts1 == ts2 { - self.vals[i].2.merge(&v2); + self.vals[i].2.merge(v2); } } Err(i) => { |