diff options
author | mdecimus <mauro@stalw.art> | 2024-04-23 20:03:30 +0200 |
---|---|---|
committer | mdecimus <mauro@stalw.art> | 2024-05-02 10:18:58 +0100 |
commit | c6960bfba8b993d0c3bdbd8789360b1aea07fbd2 (patch) | |
tree | 9823b840c2cdbc5a5fabf7f4f72e9adbc77e086c /crates/jmap-proto | |
parent | 03332635f82498c49d63800c2fa3e3db5db1529a (diff) |
documentId generation within the database transaction
Diffstat (limited to 'crates/jmap-proto')
-rw-r--r-- | crates/jmap-proto/src/object/index.rs | 6 | ||||
-rw-r--r-- | crates/jmap-proto/src/types/keyword.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/jmap-proto/src/object/index.rs b/crates/jmap-proto/src/object/index.rs index 7ba65eea..0faccec6 100644 --- a/crates/jmap-proto/src/object/index.rs +++ b/crates/jmap-proto/src/object/index.rs @@ -440,7 +440,7 @@ fn merge_batch( if has_changes { batch.ops.push(Operation::Value { class: Property::Value.into(), - op: ValueOp::Set(current.serialize()), + op: ValueOp::Set(current.serialize().into()), }); } } @@ -629,13 +629,13 @@ impl IntoIndex for &Id { } } -impl From<Property> for ValueClass { +impl<T> From<Property> for ValueClass<T> { fn from(value: Property) -> Self { ValueClass::Property(value.into()) } } -impl From<Property> for BitmapClass { +impl<T> From<Property> for BitmapClass<T> { fn from(value: Property) -> Self { BitmapClass::Tag { field: value.into(), diff --git a/crates/jmap-proto/src/types/keyword.rs b/crates/jmap-proto/src/types/keyword.rs index 1d5f75d0..8bf9cac0 100644 --- a/crates/jmap-proto/src/types/keyword.rs +++ b/crates/jmap-proto/src/types/keyword.rs @@ -285,7 +285,7 @@ impl DeserializeFrom for Keyword { } } -impl From<Keyword> for TagValue { +impl<T> From<Keyword> for TagValue<T> { fn from(value: Keyword) -> Self { match value { Keyword::Seen => TagValue::Static(SEEN as u8), @@ -305,7 +305,7 @@ impl From<Keyword> for TagValue { } } -impl From<&Keyword> for TagValue { +impl<T> From<&Keyword> for TagValue<T> { fn from(value: &Keyword) -> Self { match value { Keyword::Seen => TagValue::Static(SEEN as u8), |