diff options
author | Alex <alex@adnab.me> | 2022-09-13 16:49:05 +0200 |
---|---|---|
committer | Alex <alex@adnab.me> | 2022-09-13 16:49:05 +0200 |
commit | 80fdbfb0aa1b7186db3aeef888c0954748a35c62 (patch) | |
tree | 20c275ab7019b9c1458e4c2daef56a1b93411f8a /src/util | |
parent | 11bdc971e2aaa1ef90358b7d9c1bd6a8e9743bbf (diff) | |
parent | ab722cb40f5aacf661a280b7eb025acd3aefc1bb (diff) | |
download | garage-80fdbfb0aa1b7186db3aeef888c0954748a35c62.tar.gz garage-80fdbfb0aa1b7186db3aeef888c0954748a35c62.zip |
Merge pull request 'various fixes for v0.8.0' (#380) from various-fixes-for-0.8 into mainv0.8.0-beta1
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/380
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/crdt/bool.rs | 2 | ||||
-rw-r--r-- | src/util/crdt/deletable.rs | 2 | ||||
-rw-r--r-- | src/util/crdt/lww.rs | 2 | ||||
-rw-r--r-- | src/util/crdt/lww_map.rs | 2 | ||||
-rw-r--r-- | src/util/crdt/map.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/util/crdt/bool.rs b/src/util/crdt/bool.rs index 53af8f82..111eb5f1 100644 --- a/src/util/crdt/bool.rs +++ b/src/util/crdt/bool.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::crdt::crdt::*; /// Boolean, where `true` is an absorbing state -#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq)] +#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)] pub struct Bool(bool); impl Bool { diff --git a/src/util/crdt/deletable.rs b/src/util/crdt/deletable.rs index c76f5cbb..e771aceb 100644 --- a/src/util/crdt/deletable.rs +++ b/src/util/crdt/deletable.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::crdt::crdt::*; /// Deletable object (once deleted, cannot go back) -#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq)] +#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Eq)] pub enum Deletable<T> { Present(T), Deleted, diff --git a/src/util/crdt/lww.rs b/src/util/crdt/lww.rs index 254abe8e..958844c9 100644 --- a/src/util/crdt/lww.rs +++ b/src/util/crdt/lww.rs @@ -37,7 +37,7 @@ use crate::crdt::crdt::*; /// /// This scheme is used by AWS S3 or Soundcloud and often without knowing /// in enterprise when reconciliating databases with ad-hoc scripts. -#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] pub struct Lww<T> { ts: u64, v: T, diff --git a/src/util/crdt/lww_map.rs b/src/util/crdt/lww_map.rs index 91d24c7f..88113856 100644 --- a/src/util/crdt/lww_map.rs +++ b/src/util/crdt/lww_map.rs @@ -23,7 +23,7 @@ use crate::crdt::crdt::*; /// However, note that even if we were using a more efficient data structure such as a `BTreeMap`, /// the serialization cost `O(n)` would still have to be paid at each modification, so we are /// actually not losing anything here. -#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] pub struct LwwMap<K, V> { vals: Vec<(K, u64, V)>, } diff --git a/src/util/crdt/map.rs b/src/util/crdt/map.rs index f9ed19b6..5d1e1520 100644 --- a/src/util/crdt/map.rs +++ b/src/util/crdt/map.rs @@ -16,7 +16,7 @@ use crate::crdt::crdt::*; /// However, note that even if we were using a more efficient data structure such as a `BTreeMap`, /// the serialization cost `O(n)` would still have to be paid at each modification, so we are /// actually not losing anything here. -#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] +#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)] pub struct Map<K, V> { vals: Vec<(K, V)>, } |