optimize with SmallString; consolidate related re-exports

Signed-off-by: Jason Volk <jason@zemos.net>

src/database/Cargo.toml

@@ -34,7 +34,6 @@ zstd_compression = [
 ]
 
 [dependencies]
-arrayvec.workspace = true
 async-channel.workspace = true
 conduwuit-core.workspace = true
 const-str.workspace = true
@@ -45,7 +44,6 @@ minicbor-serde.workspace = true
 rust-rocksdb.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-smallvec.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 

src/database/de.rs

@@ -1,5 +1,6 @@
-use arrayvec::ArrayVec;
-use conduwuit::{checked, debug::DebugInspect, err, utils::string, Error, Result};
+use conduwuit::{
+	arrayvec::ArrayVec, checked, debug::DebugInspect, err, utils::string, Error, Result,
+};
 use serde::{
 	de,
 	de::{DeserializeSeed, Visitor},

src/database/keyval.rs

@@ -1,6 +1,5 @@
-use conduwuit::Result;
+use conduwuit::{smallvec::SmallVec, Result};
 use serde::{Deserialize, Serialize};
-use smallvec::SmallVec;
 
 use crate::{de, ser};
 

src/database/map/contains.rs

@@ -1,7 +1,7 @@
 use std::{convert::AsRef, fmt::Debug, future::Future, io::Write, sync::Arc};
 
-use arrayvec::ArrayVec;
 use conduwuit::{
+	arrayvec::ArrayVec,
 	err, implement,
 	utils::{future::TryExtExt, result::FlatOk},
 	Result,

src/database/map/insert.rs

@@ -5,8 +5,7 @@
 
 use std::{convert::AsRef, fmt::Debug, io::Write};
 
-use arrayvec::ArrayVec;
-use conduwuit::implement;
+use conduwuit::{arrayvec::ArrayVec, implement};
 use rocksdb::WriteBatchWithTransaction;
 use serde::Serialize;
 

src/database/map/qry.rs

@@ -1,7 +1,6 @@
 use std::{convert::AsRef, fmt::Debug, io::Write, sync::Arc};
 
-use arrayvec::ArrayVec;
-use conduwuit::{implement, Result};
+use conduwuit::{arrayvec::ArrayVec, implement, Result};
 use futures::Future;
 use serde::Serialize;
 

src/database/map/remove.rs

@@ -1,7 +1,6 @@
 use std::{convert::AsRef, fmt::Debug, io::Write};
 
-use arrayvec::ArrayVec;
-use conduwuit::implement;
+use conduwuit::{arrayvec::ArrayVec, implement};
 use serde::Serialize;
 
 use crate::{keyval::KeyBuf, ser, util::or_else};

src/database/pool.rs

@@ -14,6 +14,7 @@ use async_channel::{QueueStrategy, Receiver, RecvError, Sender};
 use conduwuit::{
 	debug, debug_warn, err, error, implement,
 	result::DebugInspect,
+	smallvec::SmallVec,
 	trace,
 	utils::sys::compute::{get_affinity, nth_core_available, set_affinity},
 	Error, Result, Server,
@@ -21,7 +22,6 @@ use conduwuit::{
 use futures::{channel::oneshot, TryFutureExt};
 use oneshot::Sender as ResultSender;
 use rocksdb::Direction;
-use smallvec::SmallVec;
 
 use self::configure::configure;
 use crate::{keyval::KeyBuf, stream, Handle, Map};

src/database/tests.rs

@@ -2,8 +2,10 @@
 
 use std::fmt::Debug;
 
-use arrayvec::ArrayVec;
-use conduwuit::ruma::{serde::Raw, EventId, RoomId, UserId};
+use conduwuit::{
+	arrayvec::ArrayVec,
+	ruma::{serde::Raw, EventId, RoomId, UserId},
+};
 use serde::Serialize;
 
 use crate::{