From 4ec5d1e28e6cfff3d98c36c2b02aece196ee93c0 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 14 Nov 2024 04:31:29 +0000
Subject: [PATCH] replace additional use tracing::
add log:: to disallowed-macros
Signed-off-by: Jason Volk <jason@zemos.net>
---
clippy.toml | 8 ++++++++
src/api/client/report.rs | 3 +--
src/api/server/make_join.rs | 6 ++++--
src/core/debug.rs | 2 ++
src/core/log/mod.rs | 2 ++
src/core/utils/sys.rs | 4 +---
src/router/serve/plain.rs | 3 +--
7 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/clippy.toml b/clippy.toml
index 08641fcc1..b93b23775 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -5,3 +5,11 @@ future-size-threshold = 7745 # TODO reduce me ALARA
stack-size-threshold = 196608 # reduce me ALARA
too-many-lines-threshold = 700 # TODO reduce me to <= 100
type-complexity-threshold = 250 # reduce me to ~200
+
+disallowed-macros = [
+ { path = "log::error", reason = "use conduit_core::error" },
+ { path = "log::warn", reason = "use conduit_core::warn" },
+ { path = "log::info", reason = "use conduit_core::info" },
+ { path = "log::debug", reason = "use conduit_core::debug" },
+ { path = "log::trace", reason = "use conduit_core::trace" },
+]
diff --git a/src/api/client/report.rs b/src/api/client/report.rs
index e20fa8c22..a01337045 100644
--- a/src/api/client/report.rs
+++ b/src/api/client/report.rs
@@ -2,7 +2,7 @@
use axum::extract::State;
use axum_client_ip::InsecureClientIp;
-use conduit::{utils::ReadyExt, Err};
+use conduit::{info, utils::ReadyExt, Err};
use rand::Rng;
use ruma::{
api::client::{
@@ -13,7 +13,6 @@
int, EventId, RoomId, UserId,
};
use tokio::time::sleep;
-use tracing::info;
use crate::{
debug_info,
diff --git a/src/api/server/make_join.rs b/src/api/server/make_join.rs
index c3524f0e4..af5700647 100644
--- a/src/api/server/make_join.rs
+++ b/src/api/server/make_join.rs
@@ -1,5 +1,8 @@
use axum::extract::State;
-use conduit::utils::{IterStream, ReadyExt};
+use conduit::{
+ utils::{IterStream, ReadyExt},
+ warn,
+};
use futures::StreamExt;
use ruma::{
api::{client::error::ErrorKind, federation::membership::prepare_join_event},
@@ -13,7 +16,6 @@
CanonicalJsonObject, RoomId, RoomVersionId, UserId,
};
use serde_json::value::to_raw_value;
-use tracing::warn;
use crate::{
service::{pdu::PduBuilder, Services},
diff --git a/src/core/debug.rs b/src/core/debug.rs
index 85574a2f3..f7420784e 100644
--- a/src/core/debug.rs
+++ b/src/core/debug.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::disallowed_macros)]
+
use std::{any::Any, panic};
// Export debug proc_macros
diff --git a/src/core/log/mod.rs b/src/core/log/mod.rs
index 1c415c6a0..48b7f0f38 100644
--- a/src/core/log/mod.rs
+++ b/src/core/log/mod.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::disallowed_macros)]
+
pub mod capture;
pub mod color;
pub mod fmt;
diff --git a/src/core/utils/sys.rs b/src/core/utils/sys.rs
index 6c396921c..af8bd70b7 100644
--- a/src/core/utils/sys.rs
+++ b/src/core/utils/sys.rs
@@ -1,6 +1,4 @@
-use tracing::debug;
-
-use crate::Result;
+use crate::{debug, Result};
/// This is needed for opening lots of file descriptors, which tends to
/// happen more often when using RocksDB and making lots of federation
diff --git a/src/router/serve/plain.rs b/src/router/serve/plain.rs
index 08263353b..144bff85d 100644
--- a/src/router/serve/plain.rs
+++ b/src/router/serve/plain.rs
@@ -5,9 +5,8 @@
use axum::Router;
use axum_server::{bind, Handle as ServerHandle};
-use conduit::{debug_info, Result, Server};
+use conduit::{debug_info, info, Result, Server};
use tokio::task::JoinSet;
-use tracing::info;
pub(super) async fn serve(
server: &Arc<Server>, app: Router, handle: ServerHandle, addrs: Vec<SocketAddr>,
--
GitLab