Skip to content

fix: Don't condition neqo_common::log::init on cfg(test) #3024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
larseggert wants to merge 6 commits into from
Closed

fix: Don't condition neqo_common::log::init on cfg(test) #3024

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
47fc12b
fix: Don't condition `neqo_common::log::init` on `cfg(test)`
larseggert Oct 1, 2025
af9bce6
Disable logging to check perf impact
larseggert Oct 1, 2025
4cf0e9c
Undo
larseggert Oct 1, 2025
8446d82
Fix
larseggert Oct 13, 2025
6d958ce
Merge branch 'main' into fix-2368
larseggert Oct 13, 2025
551d49d
Unbreak
larseggert Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions neqo-common/src/log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ pub fn init(level_filter: Option<log::LevelFilter>) {
// TODO: Enable `#[clippy::format_args]` once our MSRV is >= 1.84
macro_rules! qerror {
($($arg:tt)*) => ( {
<<<<<<< Updated upstream
||||||| Stash base
#[cfg(any(test, feature = "bench"))]
=======
#[cfg(debug_assertions)]
>>>>>>> Stashed changes
Comment thread
larseggert marked this conversation as resolved.
Outdated
::neqo_common::log::init(None);
Comment thread
larseggert marked this conversation as resolved.
::log::error!($($arg)*);
} );
Expand All @@ -61,7 +66,12 @@ macro_rules! qerror {
// TODO: Enable `#[clippy::format_args]` once our MSRV is >= 1.84
macro_rules! qwarn {
($($arg:tt)*) => ( {
<<<<<<< Updated upstream
||||||| Stash base
#[cfg(any(test, feature = "bench"))]
=======
#[cfg(debug_assertions)]
>>>>>>> Stashed changes
Comment thread
larseggert marked this conversation as resolved.
Outdated
::neqo_common::log::init(None);
Comment thread
larseggert marked this conversation as resolved.
::log::warn!($($arg)*);
} );
Expand All @@ -70,7 +80,12 @@ macro_rules! qwarn {
// TODO: Enable `#[clippy::format_args]` once our MSRV is >= 1.84
macro_rules! qinfo {
($($arg:tt)*) => ( {
<<<<<<< Updated upstream
||||||| Stash base
#[cfg(any(test, feature = "bench"))]
=======
#[cfg(debug_assertions)]
>>>>>>> Stashed changes
Comment thread
larseggert marked this conversation as resolved.
Outdated
::neqo_common::log::init(None);
Comment thread
larseggert marked this conversation as resolved.
::log::info!($($arg)*);
} );
Expand All @@ -79,7 +94,12 @@ macro_rules! qinfo {
// TODO: Enable `#[clippy::format_args]` once our MSRV is >= 1.84
macro_rules! qdebug {
($($arg:tt)*) => ( {
<<<<<<< Updated upstream
||||||| Stash base
#[cfg(any(test, feature = "bench"))]
=======
#[cfg(debug_assertions)]
>>>>>>> Stashed changes
Comment thread
larseggert marked this conversation as resolved.
Outdated
::neqo_common::log::init(None);
Comment thread
larseggert marked this conversation as resolved.
::log::debug!($($arg)*);
} );
Expand All @@ -88,7 +108,12 @@ macro_rules! qdebug {
// TODO: Enable `#[clippy::format_args]` once our MSRV is >= 1.84
macro_rules! qtrace {
($($arg:tt)*) => ( {
<<<<<<< Updated upstream
||||||| Stash base
#[cfg(any(test, feature = "bench"))]
=======
#[cfg(debug_assertions)]
>>>>>>> Stashed changes
Comment thread
larseggert marked this conversation as resolved.
Outdated
::neqo_common::log::init(None);
Comment thread
larseggert marked this conversation as resolved.
::log::trace!($($arg)*);
} );
Expand Down
Loading