Skip to content

Commit d0061e3

Browse files
committed
refactor: Pull out writer as a top-level concept
In thinking over #365 and looking over `Logger`, this is an orthogonal, top-level concept Maybe at a later point, we can consider if we should revisit how this is exposed in the API.
1 parent b5bf939 commit d0061e3

6 files changed

Lines changed: 10 additions & 9 deletions

File tree

src/fmt/mod.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ use log::Record;
7171
mod humantime;
7272
#[cfg(feature = "kv")]
7373
mod kv;
74-
pub(crate) mod writer;
7574

7675
#[cfg(feature = "color")]
7776
pub use anstyle as style;
@@ -80,10 +79,10 @@ pub use anstyle as style;
8079
pub use self::humantime::Timestamp;
8180
#[cfg(feature = "kv")]
8281
pub use self::kv::*;
83-
pub use self::writer::Target;
84-
pub use self::writer::WriteStyle;
82+
pub use crate::writer::Target;
83+
pub use crate::writer::WriteStyle;
8584

86-
use self::writer::{Buffer, Writer};
85+
use crate::writer::{Buffer, Writer};
8786

8887
/// Formatting precision of timestamps.
8988
///
@@ -650,7 +649,7 @@ mod tests {
650649
}
651650

652651
fn formatter() -> Formatter {
653-
let writer = writer::Builder::new()
652+
let writer = crate::writer::Builder::new()
654653
.write_style(WriteStyle::Never)
655654
.build();
656655

src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@
265265
#![warn(clippy::print_stdout)]
266266

267267
mod logger;
268+
mod writer;
268269

269270
pub mod fmt;
270271

src/logger.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use std::{borrow::Cow, cell::RefCell, env, io};
33
use log::{LevelFilter, Log, Metadata, Record, SetLoggerError};
44

55
use crate::fmt;
6-
use crate::fmt::writer::{self, Writer};
76
use crate::fmt::{FormatFn, Formatter};
7+
use crate::writer::{self, Writer};
88

99
/// The default name for the environment variable to read filters from.
1010
pub const DEFAULT_FILTER_ENV: &str = "RUST_LOG";
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{io, sync::Mutex};
22

3-
use crate::fmt::writer::WriteStyle;
3+
use crate::writer::WriteStyle;
44

55
#[derive(Debug)]
66
pub(crate) struct BufferWriter {
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
mod buffer;
22
mod target;
33

4-
use self::buffer::BufferWriter;
54
use std::{io, mem, sync::Mutex};
65

7-
pub(crate) use self::buffer::Buffer;
6+
use buffer::BufferWriter;
7+
8+
pub(crate) use buffer::Buffer;
89

910
pub use target::Target;
1011

0 commit comments

Comments
 (0)