Rebase changes

crates/imap/src/core/message.rs

@@ -11,7 +11,10 @@ use common::{NextMailboxState, listener::SessionStream};
 use email::message::metadata::MessageData;
 use imap_proto::protocol::{Sequence, expunge, select::Exists};
 use jmap_proto::types::{collection::Collection, property::Property};
-use store::write::{AlignedBytes, Archive};
+use store::{
+    ValueKey,
+    write::{AlignedBytes, Archive, ValueClass},
+};
 use trc::AddContext;
 
 use crate::core::ImapId;

crates/imap/src/op/status.rs

@@ -25,9 +25,7 @@ use store::{
     write::{AlignedBytes, Archive},
 };
 use store::{
-    IndexKeyPrefix, IterateParams, ValueKey,
-    roaring::RoaringBitmap,
-    write::{ValueClass, key::DeserializeBigEndian},
+    IndexKeyPrefix, IterateParams, roaring::RoaringBitmap, write::key::DeserializeBigEndian,
 };
 use trc::AddContext;
 

crates/jmap-proto/src/types/keyword.rs

@@ -7,7 +7,7 @@
 use std::fmt::Display;
 
 use store::{
-    Serialize, SerializedVersion,
+    Serialize,
     write::{MaybeDynamicId, TagValue},
 };