diff --git a/src/core/mod.rs b/src/core/mod.rs index bd597c369..b025b8b17 100644 --- a/src/core/mod.rs +++ b/src/core/mod.rs @@ -41,7 +41,7 @@ pub use info::{ pub use matrix::{Event, EventTypeExt, Pdu, PduCount, PduEvent, PduId, pdu, state_res}; pub use parking_lot::{Mutex as SyncMutex, RwLock as SyncRwLock}; pub use server::Server; -pub use utils::{implement, result, result::Result}; +pub use utils::{result, result::Result}; pub use crate as conduwuit_core; diff --git a/src/core/utils/mod.rs b/src/core/utils/mod.rs index 1d62e7508..12baee8f8 100644 --- a/src/core/utils/mod.rs +++ b/src/core/utils/mod.rs @@ -22,8 +22,6 @@ mod tests; pub mod time; pub mod with_lock; -pub use ::conduwuit_macros::implement; - pub use self::{ arrayvec::ArrayVecExt, bool::BoolExt, diff --git a/src/database/engine/open.rs b/src/database/engine/open.rs index 094ff8f1b..73d9d6c8a 100644 --- a/src/database/engine/open.rs +++ b/src/database/engine/open.rs @@ -4,7 +4,7 @@ use std::{ sync::{Arc, atomic::AtomicU32}, }; -use conduwuit::{Result, debug, implement, info, warn}; +use conduwuit::{Result, debug, info, warn}; use rocksdb::{ColumnFamilyDescriptor, Options}; use super::{ diff --git a/src/database/map/compact.rs b/src/database/map/compact.rs index ae6890ccd..9a5c0b718 100644 --- a/src/database/map/compact.rs +++ b/src/database/map/compact.rs @@ -1,4 +1,4 @@ -use conduwuit::{Err, Result, implement}; +use conduwuit::{Err, Result}; use rocksdb::{BottommostLevelCompaction, CompactOptions}; use crate::keyval::KeyBuf; diff --git a/src/database/map/keys_from.rs b/src/database/map/keys_from.rs index 80bafd8db..47b5d7e6b 100644 --- a/src/database/map/keys_from.rs +++ b/src/database/map/keys_from.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduwuit::{Result, implement}; +use conduwuit::Result; use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt}; use rocksdb::Direction; use serde::{Deserialize, Serialize}; diff --git a/src/database/map/qry_batch.rs b/src/database/map/qry_batch.rs index a1f38c4e1..115798b56 100644 --- a/src/database/map/qry_batch.rs +++ b/src/database/map/qry_batch.rs @@ -1,7 +1,7 @@ use std::{fmt::Debug, sync::Arc}; use conduwuit::{ - Result, implement, + Result, utils::{ IterStream, stream::{WidebandExt, automatic_amplification, automatic_width}, diff --git a/src/database/map/rev_keys_prefix.rs b/src/database/map/rev_keys_prefix.rs index d55493e81..2cbc11129 100644 --- a/src/database/map/rev_keys_prefix.rs +++ b/src/database/map/rev_keys_prefix.rs @@ -1,6 +1,6 @@ use std::{convert::AsRef, fmt::Debug, sync::Arc}; -use conduwuit::{Result, implement}; +use conduwuit::Result; use futures::{Stream, StreamExt, TryStreamExt, future}; use serde::{Deserialize, Serialize};