From a5de27442a0c68a3ff2b86d15e82e5065884b787 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 12 Sep 2024 00:59:08 +0000
Subject: [PATCH] re-export crates used by error macros

Signed-off-by: Jason Volk <jason@zemos.net>
---
 src/core/error/err.rs | 30 +++++++++++++++---------------
 src/core/mod.rs       |  3 +++
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/core/error/err.rs b/src/core/error/err.rs
index 4972e92a..82bb40b0 100644
--- a/src/core/error/err.rs
+++ b/src/core/error/err.rs
@@ -44,34 +44,34 @@ macro_rules! err {
 	(Request(Forbidden($level:ident!($($args:tt)+)))) => {{
 		let mut buf = String::new();
 		$crate::error::Error::Request(
-			::ruma::api::client::error::ErrorKind::forbidden(),
+			$crate::ruma::api::client::error::ErrorKind::forbidden(),
 			$crate::err_log!(buf, $level, $($args)+),
-			::http::StatusCode::BAD_REQUEST
+			$crate::http::StatusCode::BAD_REQUEST
 		)
 	}};
 
 	(Request(Forbidden($($args:tt)+))) => {
 		$crate::error::Error::Request(
-			::ruma::api::client::error::ErrorKind::forbidden(),
+			$crate::ruma::api::client::error::ErrorKind::forbidden(),
 			$crate::format_maybe!($($args)+),
-			::http::StatusCode::BAD_REQUEST
+			$crate::http::StatusCode::BAD_REQUEST
 		)
 	};
 
 	(Request($variant:ident($level:ident!($($args:tt)+)))) => {{
 		let mut buf = String::new();
 		$crate::error::Error::Request(
-			::ruma::api::client::error::ErrorKind::$variant,
+			$crate::ruma::api::client::error::ErrorKind::$variant,
 			$crate::err_log!(buf, $level, $($args)+),
-			::http::StatusCode::BAD_REQUEST
+			$crate::http::StatusCode::BAD_REQUEST
 		)
 	}};
 
 	(Request($variant:ident($($args:tt)+))) => {
 		$crate::error::Error::Request(
-			::ruma::api::client::error::ErrorKind::$variant,
+			$crate::ruma::api::client::error::ErrorKind::$variant,
 			$crate::format_maybe!($($args)+),
-			::http::StatusCode::BAD_REQUEST
+			$crate::http::StatusCode::BAD_REQUEST
 		)
 	};
 
@@ -113,7 +113,7 @@ macro_rules! err_log {
 	($out:ident, $level:ident, $($fields:tt)+) => {{
 		use std::{fmt, fmt::Write};
 
-		use ::tracing::{
+		use $crate::tracing::{
 			callsite, callsite2, level_enabled, metadata, valueset, Callsite, Event, __macro_support,
 			__tracing_log,
 			field::{Field, ValueSet, Visit},
@@ -169,25 +169,25 @@ macro_rules! err_log {
 macro_rules! err_lev {
 	(debug_warn) => {
 		if $crate::debug::logging() {
-			::tracing::Level::WARN
+			$crate::tracing::Level::WARN
 		} else {
-			::tracing::Level::DEBUG
+			$crate::tracing::Level::DEBUG
 		}
 	};
 
 	(debug_error) => {
 		if $crate::debug::logging() {
-			::tracing::Level::ERROR
+			$crate::tracing::Level::ERROR
 		} else {
-			::tracing::Level::DEBUG
+			$crate::tracing::Level::DEBUG
 		}
 	};
 
 	(warn) => {
-		::tracing::Level::WARN
+		$crate::tracing::Level::WARN
 	};
 
 	(error) => {
-		::tracing::Level::ERROR
+		$crate::tracing::Level::ERROR
 	};
 }
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 31851f4f..e4553186 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -11,7 +11,10 @@ pub mod result;
 pub mod server;
 pub mod utils;
 
+pub use ::http;
+pub use ::ruma;
 pub use ::toml;
+pub use ::tracing;
 pub use config::Config;
 pub use error::Error;
 pub use info::{rustc_flags_capture, version, version::version};