chore: use rust edition 2024

crdt-enc-gpgme/Cargo.toml

@@ -2,7 +2,7 @@
 name = "crdt-enc-gpgme"
 version = "0.1.0"
 authors = ["Thomas Heck <t@b128.net>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 serde = "1"

crdt-enc-gpgme/src/lib.rs

@@ -1,14 +1,14 @@
 use ::anyhow::{Context, Result};
 use ::async_trait::async_trait;
 use ::crdt_enc::{
+    CoreSubHandle, Info,
     key_cryptor::Keys,
     utils::{
-        decode_version_bytes_mvreg_custom_phf, encode_version_bytes_mvreg_custom, LockBox,
+        LockBox, VersionBytes, decode_version_bytes_mvreg_custom_phf,
-        VersionBytes,
+        encode_version_bytes_mvreg_custom,
     },
-    CoreSubHandle, Info,
 };
-use ::crdts::{ctx::ReadCtx, CvRDT, MVReg, Orswot};
+use ::crdts::{CvRDT, MVReg, Orswot, ctx::ReadCtx};
 use ::serde::{Deserialize, Serialize};
 use ::std::{convert::Infallible, fmt::Debug};
 use ::uuid::Uuid;

crdt-enc-tokio/Cargo.toml

@@ -2,7 +2,7 @@
 name = "crdt-enc-tokio"
 version = "0.1.0"
 authors = ["Thomas Heck <t@b128.net>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 crdts = "7"

crdt-enc-tokio/src/lib.rs

@@ -1,4 +1,4 @@
-use ::anyhow::{ensure, Context, Error, Result};
+use ::anyhow::{Context, Error, Result, ensure};
 use ::async_trait::async_trait;
 use ::bytes::Buf;
 use ::crdt_enc::utils::{VersionBytes, VersionBytesRef};

crdt-enc-xchacha20poly1305/Cargo.toml

@@ -2,7 +2,7 @@
 name = "crdt-enc-xchacha20poly1305"
 version = "0.1.0"
 authors = ["Thomas Heck <t@b128.net>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 crdts = "7"

crdt-enc-xchacha20poly1305/src/lib.rs

@@ -1,9 +1,9 @@
 use ::agnostik::spawn_blocking;
 use ::anyhow::{Context, Error, Result};
 use ::async_trait::async_trait;
-use ::chacha20poly1305::{aead::Aead, Key, KeyInit, XChaCha20Poly1305, XNonce};
+use ::chacha20poly1305::{Key, KeyInit, XChaCha20Poly1305, XNonce, aead::Aead};
 use ::crdt_enc::utils::{VersionBytes, VersionBytesRef};
-use ::rand::{thread_rng, RngCore};
+use ::rand::{RngCore, thread_rng};
 use ::serde::{Deserialize, Serialize};
 use ::std::{borrow::Cow, fmt::Debug};
 use ::uuid::Uuid;

crdt-enc/Cargo.toml

@@ -2,7 +2,7 @@
 name = "crdt-enc"
 version = "0.1.0"
 authors = ["Thomas Heck <t@b128.net>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 crdts = "7"

crdt-enc/src/cryptor.rs

@@ -1,6 +1,6 @@
 use crate::{
-    utils::{VersionBytes, VersionBytesRef},
     CoreSubHandle,
+    utils::{VersionBytes, VersionBytesRef},
 };
 use ::anyhow::Result;
 use ::async_trait::async_trait;

crdt-enc/src/key_cryptor.rs

@@ -1,10 +1,10 @@
 use crate::{
-    utils::{VersionBytes, VersionBytesRef},
     CoreSubHandle,
+    utils::{VersionBytes, VersionBytesRef},
 };
 use ::anyhow::Result;
 use ::async_trait::async_trait;
-use ::crdts::{ctx::ReadCtx, CmRDT, CvRDT, MVReg, Orswot};
+use ::crdts::{CmRDT, CvRDT, MVReg, Orswot, ctx::ReadCtx};
 use ::serde::{Deserialize, Serialize};
 use ::std::{
     borrow::Borrow,

crdt-enc/src/lib.rs

@@ -11,13 +11,13 @@ use crate::{
 };
 use ::anyhow::{Context, Error, Result};
 use ::async_trait::async_trait;
-use ::crdts::{ctx::ReadCtx, CmRDT, CvRDT, MVReg, VClock};
+use ::crdts::{CmRDT, CvRDT, MVReg, VClock, ctx::ReadCtx};
 use ::dyn_clone::DynClone;
 use ::futures::{
     lock::Mutex as AsyncMutex,
     stream::{self, StreamExt, TryStreamExt},
 };
-use ::serde::{de::DeserializeOwned, Deserialize, Serialize};
+use ::serde::{Deserialize, Serialize, de::DeserializeOwned};
 use ::std::{
     collections::HashSet, convert::Infallible, default::Default, fmt::Debug, mem, sync::Arc,
 };

crdt-enc/src/storage.rs

@@ -1,4 +1,4 @@
-use crate::{utils::VersionBytes, CoreSubHandle};
+use crate::{CoreSubHandle, utils::VersionBytes};
 use ::anyhow::Result;
 use ::async_trait::async_trait;
 use ::crdts::MVReg;

crdt-enc/src/utils.rs

@@ -3,9 +3,9 @@ mod version_bytes;
 pub use version_bytes::*;
 
 use ::anyhow::{Context, Result};
-use ::crdts::{ctx::ReadCtx, CmRDT, CvRDT, MVReg};
+use ::crdts::{CmRDT, CvRDT, MVReg, ctx::ReadCtx};
-use ::futures::{stream, Future, FutureExt, StreamExt, TryStreamExt};
+use ::futures::{Future, FutureExt, StreamExt, TryStreamExt, stream};
-use ::serde::{de::DeserializeOwned, Deserialize, Serialize};
+use ::serde::{Deserialize, Serialize, de::DeserializeOwned};
 use ::std::{convert::Infallible, fmt::Debug, sync::Mutex as SyncMutex};
 use ::uuid::Uuid;