Skip to content

Commit ba27645

Browse files
committed
Replace private AndroidFormatter with PartialFormatter
1 parent 25e6b36 commit ba27645

File tree

3 files changed

+17
-90
lines changed

3 files changed

+17
-90
lines changed

spdlog/src/formatter/android_formatter.rs

Lines changed: 0 additions & 70 deletions
This file was deleted.

spdlog/src/formatter/mod.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@
5151
//! [`SinkPropAccess::set_formatter`]: crate::sink::SinkPropAccess::set_formatter
5252
//! [./examples]: https://github.com/SpriteOvO/spdlog-rs/tree/main/spdlog/examples
5353
54-
#[cfg(any(
55-
all(target_os = "android", feature = "native", feature = "android-ndk"),
56-
all(doc, not(doctest))
57-
))]
58-
mod android_formatter;
5954
mod full_formatter;
6055
#[cfg(feature = "serde_json")]
6156
mod json_formatter;
@@ -66,11 +61,6 @@ mod unreachable_formatter;
6661

6762
use std::ops::Range;
6863

69-
#[cfg(any(
70-
all(target_os = "android", feature = "native", feature = "android-ndk"),
71-
all(doc, not(doctest))
72-
))]
73-
pub(crate) use android_formatter::*;
7464
use dyn_clone::*;
7565
pub use full_formatter::*;
7666
#[cfg(feature = "serde_json")]

spdlog/src/sink/android_sink.rs

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::{ffi::CString, io, ptr::null, result::Result as StdResult};
33
use libc::EPERM;
44

55
use crate::{
6-
formatter::{AndroidFormatter, Formatter, FormatterContext},
6+
formatter::{Formatter, FormatterContext, PartialFormatter},
77
prelude::*,
88
sink::{GetSinkProp, Sink, SinkProp},
99
sync::*,
@@ -141,7 +141,8 @@ impl AndroidSinkBuilder {
141141

142142
/// Specifies a formatter.
143143
///
144-
/// This parameter is **optional**, and defaults to `AndroidFormatter`.
144+
/// This parameter is **optional**, and defaults to [`PartialFormatter`]
145+
/// `(!time !level !eol)`.
145146
#[must_use]
146147
pub fn formatter<F>(self, formatter: F) -> Self
147148
where
@@ -191,13 +192,13 @@ impl AndroidSink {
191192

192193
/// Gets a builder of `AndroidSink` with default parameters:
193194
///
194-
/// | Parameter | Default Value |
195-
/// |-----------------|-----------------------------|
196-
/// | [level_filter] | [`LevelFilter::All`] |
197-
/// | [formatter] | `AndroidFormatter` |
198-
/// | [error_handler] | [`ErrorHandler::default()`] |
199-
/// | | |
200-
/// | [tag] | [`AndroidLogTag::Default`] |
195+
/// | Parameter | Default Value |
196+
/// |-----------------|--------------------------------------------|
197+
/// | [level_filter] | [`LevelFilter::All`] |
198+
/// | [formatter] | [`PartialFormatter`] `(!time !level !eol)` |
199+
/// | [error_handler] | [`ErrorHandler::default()`] |
200+
/// | | |
201+
/// | [tag] | [`AndroidLogTag::Default`] |
201202
///
202203
/// [level_filter]: AndroidSinkBuilder::level_filter
203204
/// [formatter]: AndroidSinkBuilder::formatter
@@ -206,7 +207,13 @@ impl AndroidSink {
206207
#[must_use]
207208
pub fn builder() -> AndroidSinkBuilder {
208209
let prop = SinkProp::default();
209-
prop.set_formatter(AndroidFormatter::new());
210+
prop.set_formatter(
211+
PartialFormatter::builder()
212+
.time(false)
213+
.level(false)
214+
.eol(false)
215+
.build(),
216+
);
210217

211218
AndroidSinkBuilder {
212219
prop,

0 commit comments

Comments
 (0)