Skip to content

Commit 0a3116d

Browse files
committed
Uniformly set default log level to INFO
Commit a98f548 ("Capture INFO and WARN from tracing by default") adjusted the tracing part of the crate to use the INFO log level by default. With this change we switch the log part over to doing the same.
1 parent 2a2287b commit 0a3116d

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

macros/src/lib.rs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,20 @@ impl AttributeArgs {
155155
/// Expand the initialization code for the `log` crate.
156156
#[cfg(all(feature = "log", not(feature = "trace")))]
157157
fn expand_logging_init(attribute_args: &AttributeArgs) -> Tokens {
158-
let add_default_log_filter = if let Some(default_log_filter) = &attribute_args.default_log_filter
159-
{
160-
quote! {
161-
let env_logger_builder = env_logger_builder
162-
.parse_env(::test_log::env_logger::Env::default().default_filter_or(#default_log_filter));
163-
}
164-
} else {
165-
quote! {}
166-
};
158+
let default_filter = attribute_args
159+
.default_log_filter
160+
.as_ref()
161+
.unwrap_or(&::std::borrow::Cow::Borrowed("info"));
167162

168163
quote! {
169164
{
170-
let mut env_logger_builder = ::test_log::env_logger::builder();
171-
#add_default_log_filter
172-
let _ = env_logger_builder.is_test(true).try_init();
165+
let mut env_logger_builder = ::test_log::env_logger::builder()
166+
.parse_env(
167+
::test_log::env_logger::Env::default()
168+
.default_filter_or(#default_filter)
169+
)
170+
.is_test(true)
171+
.try_init();
173172
}
174173
}
175174
}

0 commit comments

Comments
 (0)