diff --git a/src/api/client/state.rs b/src/api/client/state.rs index 17ae7be4..9247b123 100644 --- a/src/api/client/state.rs +++ b/src/api/client/state.rs @@ -1,5 +1,6 @@ use std::sync::Arc; +use conduit::{error, warn}; use ruma::{ api::client::{ error::ErrorKind, @@ -16,7 +17,6 @@ use ruma::{ serde::Raw, EventId, RoomId, UserId, }; -use tracing::{error, log::warn}; use crate::{ service::{pdu::PduBuilder, server_is_ours}, diff --git a/src/core/debug.rs b/src/core/debug.rs index ad12099b..7522aa77 100644 --- a/src/core/debug.rs +++ b/src/core/debug.rs @@ -14,9 +14,9 @@ pub use crate::utils::debug::*; macro_rules! debug_event { ( $level:expr, $($x:tt)+ ) => { if cfg!(debug_assertions) && cfg!(not(feature = "dev_release_log_level")) { - tracing::event!( $level, $($x)+ ); + ::tracing::event!( $level, $($x)+ ); } else { - tracing::debug!( $($x)+ ); + ::tracing::debug!( $($x)+ ); } } } @@ -27,7 +27,7 @@ macro_rules! debug_event { #[macro_export] macro_rules! debug_error { ( $($x:tt)+ ) => { - $crate::debug_event!(tracing::Level::ERROR, $($x)+ ); + $crate::debug_event!(::tracing::Level::ERROR, $($x)+ ); } } @@ -37,7 +37,7 @@ macro_rules! debug_error { #[macro_export] macro_rules! debug_warn { ( $($x:tt)+ ) => { - $crate::debug_event!(tracing::Level::WARN, $($x)+ ); + $crate::debug_event!(::tracing::Level::WARN, $($x)+ ); } } @@ -47,7 +47,7 @@ macro_rules! debug_warn { #[macro_export] macro_rules! debug_info { ( $($x:tt)+ ) => { - $crate::debug_event!(tracing::Level::INFO, $($x)+ ); + $crate::debug_event!(::tracing::Level::INFO, $($x)+ ); } } diff --git a/src/core/log/mod.rs b/src/core/log/mod.rs index 97da6b40..49efe56d 100644 --- a/src/core/log/mod.rs +++ b/src/core/log/mod.rs @@ -20,25 +20,25 @@ pub use tracing_subscriber::EnvFilter; #[macro_export] macro_rules! error { - ( $($x:tt)+ ) => { tracing::error!( $($x)+ ); } + ( $($x:tt)+ ) => { ::tracing::error!( $($x)+ ); } } #[macro_export] macro_rules! warn { - ( $($x:tt)+ ) => { tracing::warn!( $($x)+ ); } + ( $($x:tt)+ ) => { ::tracing::warn!( $($x)+ ); } } #[macro_export] macro_rules! info { - ( $($x:tt)+ ) => { tracing::info!( $($x)+ ); } + ( $($x:tt)+ ) => { ::tracing::info!( $($x)+ ); } } #[macro_export] macro_rules! debug { - ( $($x:tt)+ ) => { tracing::debug!( $($x)+ ); } + ( $($x:tt)+ ) => { ::tracing::debug!( $($x)+ ); } } #[macro_export] macro_rules! trace { - ( $($x:tt)+ ) => { tracing::trace!( $($x)+ ); } + ( $($x:tt)+ ) => { ::tracing::trace!( $($x)+ ); } }