Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 23 additions & 18 deletions crates/env_filter/src/filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ use crate::ParseError;
/// ## Example
///
/// ```
/// # #[cfg(feature = "std")] {
/// # use std::env;
/// use env_filter::Builder;
///
Expand All @@ -29,6 +30,7 @@ use crate::ParseError;
/// }
///
/// let filter = builder.build();
/// # }
/// ```
pub struct Builder {
directives: Vec<Directive>,
Expand Down Expand Up @@ -98,6 +100,7 @@ impl Builder {
/// See the [Enabling Logging] section for more details.
///
/// [Enabling Logging]: ../index.html#enabling-logging
#[cfg(feature = "std")]
pub fn parse(&mut self, filters: &str) -> &mut Self {
#![allow(clippy::print_stderr)] // compatibility

Expand All @@ -108,7 +111,6 @@ impl Builder {
} = parse_spec(filters);

for error in errors {
#[cfg(feature = "std")]
eprintln!("warning: {error}, ignoring it");
}

Expand Down Expand Up @@ -310,14 +312,17 @@ mod tests {

#[test]
fn parse_default() {
let logger = Builder::new().parse("info,crate1::mod1=warn").build();
let logger = Builder::new()
.try_parse("info,crate1::mod1=warn")
.unwrap()
.build();
assert!(enabled(&logger.directives, Level::Warn, "crate1::mod1"));
assert!(enabled(&logger.directives, Level::Info, "crate2::mod2"));
}

#[test]
fn parse_default_bare_level_off_lc() {
let logger = Builder::new().parse("off").build();
let logger = Builder::new().try_parse("off").unwrap().build();
assert!(!enabled(&logger.directives, Level::Error, ""));
assert!(!enabled(&logger.directives, Level::Warn, ""));
assert!(!enabled(&logger.directives, Level::Info, ""));
Expand All @@ -327,7 +332,7 @@ mod tests {

#[test]
fn parse_default_bare_level_off_uc() {
let logger = Builder::new().parse("OFF").build();
let logger = Builder::new().try_parse("OFF").unwrap().build();
assert!(!enabled(&logger.directives, Level::Error, ""));
assert!(!enabled(&logger.directives, Level::Warn, ""));
assert!(!enabled(&logger.directives, Level::Info, ""));
Expand All @@ -337,7 +342,7 @@ mod tests {

#[test]
fn parse_default_bare_level_error_lc() {
let logger = Builder::new().parse("error").build();
let logger = Builder::new().try_parse("error").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(!enabled(&logger.directives, Level::Warn, ""));
assert!(!enabled(&logger.directives, Level::Info, ""));
Expand All @@ -347,7 +352,7 @@ mod tests {

#[test]
fn parse_default_bare_level_error_uc() {
let logger = Builder::new().parse("ERROR").build();
let logger = Builder::new().try_parse("ERROR").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(!enabled(&logger.directives, Level::Warn, ""));
assert!(!enabled(&logger.directives, Level::Info, ""));
Expand All @@ -357,7 +362,7 @@ mod tests {

#[test]
fn parse_default_bare_level_warn_lc() {
let logger = Builder::new().parse("warn").build();
let logger = Builder::new().try_parse("warn").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(!enabled(&logger.directives, Level::Info, ""));
Expand All @@ -367,7 +372,7 @@ mod tests {

#[test]
fn parse_default_bare_level_warn_uc() {
let logger = Builder::new().parse("WARN").build();
let logger = Builder::new().try_parse("WARN").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(!enabled(&logger.directives, Level::Info, ""));
Expand All @@ -377,7 +382,7 @@ mod tests {

#[test]
fn parse_default_bare_level_info_lc() {
let logger = Builder::new().parse("info").build();
let logger = Builder::new().try_parse("info").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(enabled(&logger.directives, Level::Info, ""));
Expand All @@ -387,7 +392,7 @@ mod tests {

#[test]
fn parse_default_bare_level_info_uc() {
let logger = Builder::new().parse("INFO").build();
let logger = Builder::new().try_parse("INFO").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(enabled(&logger.directives, Level::Info, ""));
Expand All @@ -397,7 +402,7 @@ mod tests {

#[test]
fn parse_default_bare_level_debug_lc() {
let logger = Builder::new().parse("debug").build();
let logger = Builder::new().try_parse("debug").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(enabled(&logger.directives, Level::Info, ""));
Expand All @@ -407,7 +412,7 @@ mod tests {

#[test]
fn parse_default_bare_level_debug_uc() {
let logger = Builder::new().parse("DEBUG").build();
let logger = Builder::new().try_parse("DEBUG").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(enabled(&logger.directives, Level::Info, ""));
Expand All @@ -417,7 +422,7 @@ mod tests {

#[test]
fn parse_default_bare_level_trace_lc() {
let logger = Builder::new().parse("trace").build();
let logger = Builder::new().try_parse("trace").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(enabled(&logger.directives, Level::Info, ""));
Expand All @@ -427,7 +432,7 @@ mod tests {

#[test]
fn parse_default_bare_level_trace_uc() {
let logger = Builder::new().parse("TRACE").build();
let logger = Builder::new().try_parse("TRACE").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(enabled(&logger.directives, Level::Info, ""));
Expand All @@ -442,31 +447,31 @@ mod tests {
#[test]
fn parse_default_bare_level_debug_mixed() {
{
let logger = Builder::new().parse("Debug").build();
let logger = Builder::new().try_parse("Debug").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(enabled(&logger.directives, Level::Info, ""));
assert!(enabled(&logger.directives, Level::Debug, ""));
assert!(!enabled(&logger.directives, Level::Trace, ""));
}
{
let logger = Builder::new().parse("debuG").build();
let logger = Builder::new().try_parse("debuG").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(enabled(&logger.directives, Level::Info, ""));
assert!(enabled(&logger.directives, Level::Debug, ""));
assert!(!enabled(&logger.directives, Level::Trace, ""));
}
{
let logger = Builder::new().parse("deBug").build();
let logger = Builder::new().try_parse("deBug").unwrap().build();
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(enabled(&logger.directives, Level::Info, ""));
assert!(enabled(&logger.directives, Level::Debug, ""));
assert!(!enabled(&logger.directives, Level::Trace, ""));
}
{
let logger = Builder::new().parse("DeBuG").build(); // LaTeX flavor!
let logger = Builder::new().try_parse("DeBuG").unwrap().build(); // LaTeX flavor!
assert!(enabled(&logger.directives, Level::Error, ""));
assert!(enabled(&logger.directives, Level::Warn, ""));
assert!(enabled(&logger.directives, Level::Info, ""));
Expand Down
2 changes: 2 additions & 0 deletions crates/env_filter/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
//! logged based on the parsed filters when log records are received.
//!
//! ```
//! # #[cfg(feature = "std")] {
//! use env_filter::Filter;
//! use log::{Log, Metadata, Record};
//!
Expand All @@ -35,6 +36,7 @@
//! }
//!
//! let logger = env_filter::FilteredLog::new(PrintLogger, builder.build());
//! # }
//! ```

#![cfg_attr(docsrs, feature(doc_cfg))]
Expand Down
Loading