Skip to content

Commit c769e03

Browse files
committed
refactor(filter): Flatten the mod
1 parent 3b45c6f commit c769e03

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

crates/env_filter/src/lib.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,17 @@
5050
//! }
5151
//! ```
5252
53-
use log::{Level, LevelFilter, Metadata, Record};
53+
mod op;
54+
mod parser;
55+
5456
use std::env;
5557
use std::fmt;
5658
use std::mem;
5759

58-
mod op;
59-
mod parser;
60+
use log::{Level, LevelFilter, Metadata, Record};
61+
62+
use op::FilterOp;
63+
use parser::parse_spec;
6064

6165
/// A builder for a log filter.
6266
///
@@ -80,7 +84,7 @@ mod parser;
8084
/// ```
8185
pub struct Builder {
8286
directives: Vec<Directive>,
83-
filter: Option<op::FilterOp>,
87+
filter: Option<FilterOp>,
8488
built: bool,
8589
}
8690

@@ -146,7 +150,7 @@ impl Builder {
146150
///
147151
/// [Enabling Logging]: ../index.html#enabling-logging
148152
pub fn parse(&mut self, filters: &str) -> &mut Self {
149-
let (directives, filter) = parser::parse_spec(filters);
153+
let (directives, filter) = parse_spec(filters);
150154

151155
self.filter = filter;
152156

@@ -221,7 +225,7 @@ struct Directive {
221225
/// [`Builder`]: struct.Builder.html
222226
pub struct Filter {
223227
directives: Vec<Directive>,
224-
filter: Option<op::FilterOp>,
228+
filter: Option<FilterOp>,
225229
}
226230

227231
impl Filter {

crates/env_filter/src/parser.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use log::LevelFilter;
22

3-
use crate::op;
43
use crate::Directive;
4+
use crate::FilterOp;
55

66
/// Parse a logging specification string (e.g: "crate1,crate2::mod3,crate3::x=error/foo")
77
/// and return a vector with log directives.
8-
pub(crate) fn parse_spec(spec: &str) -> (Vec<Directive>, Option<op::FilterOp>) {
8+
pub(crate) fn parse_spec(spec: &str) -> (Vec<Directive>, Option<FilterOp>) {
99
let mut dirs = Vec::new();
1010

1111
let mut parts = spec.split('/');
@@ -63,7 +63,7 @@ pub(crate) fn parse_spec(spec: &str) -> (Vec<Directive>, Option<op::FilterOp>) {
6363
}
6464
}
6565

66-
let filter = filter.and_then(|filter| match op::FilterOp::new(filter) {
66+
let filter = filter.and_then(|filter| match FilterOp::new(filter) {
6767
Ok(re) => Some(re),
6868
Err(e) => {
6969
eprintln!("warning: invalid regex filter - {}", e);

0 commit comments

Comments
 (0)