diff --git a/radicle-crdt/src/lwwmap.rs b/radicle-crdt/src/lwwmap.rs index dceb0e1b..5aa61baa 100644 --- a/radicle-crdt/src/lwwmap.rs +++ b/radicle-crdt/src/lwwmap.rs @@ -70,9 +70,7 @@ impl Default for LWWMap { } } -impl FromIterator<(K, V, C)> - for LWWMap -{ +impl FromIterator<(K, V, C)> for LWWMap { fn from_iter>(iter: I) -> Self { let mut map = LWWMap::default(); for (k, v, c) in iter.into_iter() { @@ -82,9 +80,7 @@ impl FromIterator<(K, V } } -impl Extend<(K, V, C)> - for LWWMap -{ +impl Extend<(K, V, C)> for LWWMap { fn extend>(&mut self, iter: I) { for (k, v, c) in iter.into_iter() { self.insert(k, v, c); @@ -96,7 +92,7 @@ impl Semilattice for LWWMap where K: Ord, V: Semilattice + PartialOrd + Eq, - C: Ord + Copy + Default, + C: Ord + Default, { fn merge(&mut self, other: Self) { for (k, v) in other.inner.into_iter() { diff --git a/radicle-crdt/src/lwwset.rs b/radicle-crdt/src/lwwset.rs index adc6bd97..68f9478a 100644 --- a/radicle-crdt/src/lwwset.rs +++ b/radicle-crdt/src/lwwset.rs @@ -6,7 +6,7 @@ pub struct LWWSet { inner: LWWMap, } -impl LWWSet { +impl LWWSet { pub fn singleton(value: T, clock: C) -> Self { Self { inner: LWWMap::from_iter([(value, (), clock)]), @@ -38,7 +38,7 @@ impl Default for LWWSet { } } -impl FromIterator<(T, C)> for LWWSet { +impl FromIterator<(T, C)> for LWWSet { fn from_iter>(iter: I) -> Self { let mut set = LWWSet::default(); for (v, c) in iter.into_iter() { @@ -48,7 +48,7 @@ impl FromIterator<(T, C)> for LWWSet { } } -impl Extend<(T, C)> for LWWSet { +impl Extend<(T, C)> for LWWSet { fn extend>(&mut self, iter: I) { for (v, c) in iter.into_iter() { self.insert(v, c); @@ -59,7 +59,7 @@ impl Extend<(T, C)> for LWWSet { impl Semilattice for LWWSet where T: Ord, - C: Ord + Copy + Default, + C: Ord + Default, { fn merge(&mut self, other: Self) { self.inner.merge(other.inner);