Skip to content

Commit 9ba7eea

Browse files
SpriteOvOSpriteOvO
committed
Get rid of cfg-if dependency
1 parent cf1da0e commit 9ba7eea

File tree

10 files changed

+96
-132
lines changed

10 files changed

+96
-132
lines changed

‎spdlog/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ sval = ["value-bag/sval"]
4545
[dependencies]
4646
arc-swap = "1.5.1"
4747
atomic = "0.5.1"
48-
cfg-if = "1.0.0"
4948
chrono = "0.4.22"
5049
crossbeam = { version = "0.8.2", optional = true }
5150
dyn-clone = "1.0.14"

‎spdlog/src/formatter/android_formatter.rs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
use std::fmt::{self, Write};
77

8-
use cfg_if::cfg_if;
9-
108
use crate::{
119
formatter::{Formatter, FormatterContext},
1210
Error, Record, StringBuf,
@@ -27,11 +25,8 @@ impl AndroidFormatter {
2725
dest: &mut StringBuf,
2826
_ctx: &mut FormatterContext,
2927
) -> Result<(), fmt::Error> {
30-
cfg_if! {
31-
if #[cfg(not(feature = "flexible-string"))] {
32-
dest.reserve(crate::string_buf::RESERVE_SIZE);
33-
}
34-
}
28+
#[cfg(not(feature = "flexible-string"))]
29+
dest.reserve(crate::string_buf::RESERVE_SIZE);
3530

3631
if let Some(logger_name) = record.logger_name() {
3732
dest.write_str("[")?;

‎spdlog/src/formatter/full_formatter.rs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
33
use std::fmt::{self, Write};
44

5-
use cfg_if::cfg_if;
6-
75
use crate::{
86
formatter::{fmt_with_time, Formatter, FormatterContext, TimeDate},
97
Error, Record, StringBuf, __EOL,
@@ -56,11 +54,8 @@ impl FullFormatter {
5654
dest: &mut StringBuf,
5755
ctx: &mut FormatterContext,
5856
) -> Result<(), fmt::Error> {
59-
cfg_if! {
60-
if #[cfg(not(feature = "flexible-string"))] {
61-
dest.reserve(crate::string_buf::RESERVE_SIZE);
62-
}
63-
}
57+
#[cfg(not(feature = "flexible-string"))]
58+
dest.reserve(crate::string_buf::RESERVE_SIZE);
6459

6560
fmt_with_time(
6661
ctx,

‎spdlog/src/formatter/journald_formatter.rs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
use std::fmt::{self, Write};
77

8-
use cfg_if::cfg_if;
9-
108
use crate::{
119
formatter::{Formatter, FormatterContext},
1210
Error, Record, StringBuf, __EOL,
@@ -27,11 +25,8 @@ impl JournaldFormatter {
2725
dest: &mut StringBuf,
2826
ctx: &mut FormatterContext,
2927
) -> Result<(), fmt::Error> {
30-
cfg_if! {
31-
if #[cfg(not(feature = "flexible-string"))] {
32-
dest.reserve(crate::string_buf::RESERVE_SIZE);
33-
}
34-
}
28+
#[cfg(not(feature = "flexible-string"))]
29+
dest.reserve(crate::string_buf::RESERVE_SIZE);
3530

3631
dest.write_str("[")?;
3732

‎spdlog/src/formatter/json_formatter.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use std::{
44
time::SystemTime,
55
};
66

7-
use cfg_if::cfg_if;
87
use serde::{
98
ser::{SerializeMap, SerializeStruct},
109
Serialize, Serializer,
@@ -177,11 +176,8 @@ impl JsonFormatter {
177176
dest: &mut StringBuf,
178177
_ctx: &mut FormatterContext,
179178
) -> Result<(), JsonFormatterError> {
180-
cfg_if! {
181-
if #[cfg(not(feature = "flexible-string"))] {
182-
dest.reserve(crate::string_buf::RESERVE_SIZE);
183-
}
184-
}
179+
#[cfg(not(feature = "flexible-string"))]
180+
dest.reserve(crate::string_buf::RESERVE_SIZE);
185181

186182
// TODO: https://github.com/serde-rs/json/issues/863
187183
//

‎spdlog/src/formatter/pattern_formatter/mod.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,11 +376,8 @@ where
376376
dest: &mut StringBuf,
377377
fmt_ctx: &mut FormatterContext,
378378
) -> crate::Result<()> {
379-
cfg_if::cfg_if! {
380-
if #[cfg(not(feature = "flexible-string"))] {
381-
dest.reserve(crate::string_buf::RESERVE_SIZE);
382-
}
383-
};
379+
#[cfg(not(feature = "flexible-string"))]
380+
dest.reserve(crate::string_buf::RESERVE_SIZE);
384381

385382
fmt_ctx.locked_time_date = Some(TimeDateLazyLocked::new(record.time()));
386383
{

‎spdlog/src/level.rs‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
use std::{fmt, str::FromStr};
22

3-
use cfg_if::cfg_if;
4-
53
use crate::Error;
64

75
pub(crate) const LOG_LEVEL_NAMES: [&str; Level::count()] =
@@ -77,12 +75,6 @@ impl serde::Serialize for Level {
7775
}
7876
}
7977

80-
cfg_if! {
81-
if #[cfg(test)] {
82-
crate::utils::const_assert!(atomic::Atomic::<Level>::is_lock_free());
83-
}
84-
}
85-
8678
impl Level {
8779
#[must_use]
8880
fn from_usize(u: usize) -> Option<Level> {
@@ -216,17 +208,6 @@ pub enum LevelFilter {
216208
All,
217209
}
218210

219-
cfg_if! {
220-
if #[cfg(test)] {
221-
use std::mem::{align_of, size_of};
222-
use crate::utils::const_assert;
223-
224-
const_assert!(atomic::Atomic::<LevelFilter>::is_lock_free());
225-
const_assert!(size_of::<Level>() * 2 == size_of::<LevelFilter>());
226-
const_assert!(align_of::<Level>() * 2 == align_of::<LevelFilter>());
227-
}
228-
}
229-
230211
impl LevelFilter {
231212
/// Checks the given level if satisfies the filter condition.
232213
#[deprecated(
@@ -301,7 +282,15 @@ impl From<log::LevelFilter> for LevelFilter {
301282

302283
#[cfg(test)]
303284
mod tests {
285+
use std::mem::{align_of, size_of};
286+
304287
use super::*;
288+
use crate::utils::const_assert;
289+
290+
const_assert!(atomic::Atomic::<Level>::is_lock_free());
291+
const_assert!(atomic::Atomic::<LevelFilter>::is_lock_free());
292+
const_assert!(size_of::<Level>() * 2 == size_of::<LevelFilter>());
293+
const_assert!(align_of::<Level>() * 2 == align_of::<LevelFilter>());
305294

306295
#[test]
307296
fn from_usize() {

‎spdlog/src/lib.rs‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ use std::{
338338
result::Result as StdResult,
339339
};
340340

341-
use cfg_if::cfg_if;
342341
use error::EnvLevelError;
343342
use sink::{Sink, StdStreamSink};
344343
use sync::*;
@@ -353,37 +352,40 @@ use sync::*;
353352
///
354353
/// [`Logger`]: crate::logger::Logger
355354
/// [`Sink`]: crate::sink::Sink
356-
pub const STATIC_LEVEL_FILTER: LevelFilter = STATIC_LEVEL_FILTER_INNER;
357-
358-
cfg_if! {
359-
if #[cfg(all(not(debug_assertions), feature = "release-level-off"))] {
360-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::Off;
361-
} else if #[cfg(all(not(debug_assertions), feature = "release-level-critical"))] {
362-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Critical);
363-
} else if #[cfg(all(not(debug_assertions), feature = "release-level-error"))] {
364-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Error);
365-
} else if #[cfg(all(not(debug_assertions), feature = "release-level-warn"))] {
366-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Warn);
367-
} else if #[cfg(all(not(debug_assertions), feature = "release-level-info"))] {
368-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Info);
369-
} else if #[cfg(all(not(debug_assertions), feature = "release-level-debug"))] {
370-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Debug);
371-
} else if #[cfg(all(not(debug_assertions), feature = "release-level-trace"))] {
372-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Trace);
373-
} else if #[cfg(feature = "level-off")] {
374-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::Off;
375-
} else if #[cfg(feature = "level-critical")] {
376-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Critical);
377-
} else if #[cfg(feature = "level-error")] {
378-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Error);
379-
} else if #[cfg(feature = "level-warn")] {
380-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Warn);
381-
} else if #[cfg(feature = "level-info")] {
382-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Info);
383-
} else if #[cfg(feature = "level-debug")] {
384-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Debug);
355+
pub const STATIC_LEVEL_FILTER: LevelFilter = static_level_filter_inner();
356+
357+
const fn static_level_filter_inner() -> LevelFilter {
358+
if cfg!(all(not(debug_assertions), feature = "release-level-off")) {
359+
LevelFilter::Off
360+
} else if cfg!(all(
361+
not(debug_assertions),
362+
feature = "release-level-critical"
363+
)) {
364+
LevelFilter::MoreSevereEqual(Level::Critical)
365+
} else if cfg!(all(not(debug_assertions), feature = "release-level-error")) {
366+
LevelFilter::MoreSevereEqual(Level::Error)
367+
} else if cfg!(all(not(debug_assertions), feature = "release-level-warn")) {
368+
LevelFilter::MoreSevereEqual(Level::Warn)
369+
} else if cfg!(all(not(debug_assertions), feature = "release-level-info")) {
370+
LevelFilter::MoreSevereEqual(Level::Info)
371+
} else if cfg!(all(not(debug_assertions), feature = "release-level-debug")) {
372+
LevelFilter::MoreSevereEqual(Level::Debug)
373+
} else if cfg!(all(not(debug_assertions), feature = "release-level-trace")) {
374+
LevelFilter::MoreSevereEqual(Level::Trace)
375+
} else if cfg!(feature = "level-off") {
376+
LevelFilter::Off
377+
} else if cfg!(feature = "level-critical") {
378+
LevelFilter::MoreSevereEqual(Level::Critical)
379+
} else if cfg!(feature = "level-error") {
380+
LevelFilter::MoreSevereEqual(Level::Error)
381+
} else if cfg!(feature = "level-warn") {
382+
LevelFilter::MoreSevereEqual(Level::Warn)
383+
} else if cfg!(feature = "level-info") {
384+
LevelFilter::MoreSevereEqual(Level::Info)
385+
} else if cfg!(feature = "level-debug") {
386+
LevelFilter::MoreSevereEqual(Level::Debug)
385387
} else {
386-
const STATIC_LEVEL_FILTER_INNER: LevelFilter = LevelFilter::MoreSevereEqual(Level::Trace);
388+
LevelFilter::MoreSevereEqual(Level::Trace)
387389
}
388390
}
389391

‎spdlog/src/string_buf.rs‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,16 @@
1919
/// [`Formatter`]: crate::formatter::Formatter
2020
pub type StringBuf = StringBufInner;
2121

22-
use cfg_if::cfg_if;
23-
2422
// Users should not use the following types directly.
2523

26-
cfg_if! {
27-
if #[cfg(feature = "flexible-string")] {
28-
// pub for hide type alias in doc
29-
#[doc(hidden)]
30-
pub type StringBufInner = flexible_string::FlexibleString<STACK_SIZE>;
31-
} else {
32-
// same as above
33-
#[doc(hidden)]
34-
pub type StringBufInner = String;
35-
}
36-
}
24+
// pub for hide type alias in doc
25+
#[doc(hidden)]
26+
#[cfg(feature = "flexible-string")]
27+
pub type StringBufInner = flexible_string::FlexibleString<STACK_SIZE>;
28+
// same as above
29+
#[doc(hidden)]
30+
#[cfg(not(feature = "flexible-string"))]
31+
pub type StringBufInner = String;
3732

3833
#[allow(dead_code)]
3934
pub(crate) const STACK_SIZE: usize = 256;

‎spdlog/tests/pattern.rs‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use std::{
44
sync::{Arc, Mutex},
55
};
66

7-
use cfg_if::cfg_if;
87
use regex::Regex;
98
#[cfg(feature = "runtime-pattern")]
109
use spdlog::formatter::runtime_pattern;
@@ -401,9 +400,8 @@ fn test_builtin_patterns() {
401400
vec![0..=i32::MAX as u64],
402401
);
403402

404-
cfg_if! {
405-
if #[cfg(feature = "source-location")] {
406-
check!(
403+
#[cfg(feature = "source-location")]
404+
check!(
407405
"{full}",
408406
Some([format!("[0000-00-00 00:00:00.000] [logger-name] [info] [pattern, {}:000] test payload {{ a=true b=text }}", file!())]),
409407
vec![
@@ -417,41 +415,44 @@ fn test_builtin_patterns() {
417415
SOURCE_RANGE,
418416
],
419417
);
420-
} else {
421-
check!(
422-
"{full}",
423-
Some(["[0000-00-00 00:00:00.000] [logger-name] [info] test payload { a=true b=text }"]),
424-
vec![
425-
YEAR_RANGE,
426-
MONTH_RANGE,
427-
DAY_RANGE,
428-
HOUR_RANGE,
429-
MINUTE_RANGE,
430-
SECOND_RANGE,
431-
MILLISECOND_RANGE,
432-
],
433-
);
434-
}
435-
}
418+
#[cfg(not(feature = "source-location"))]
419+
check!(
420+
"{full}",
421+
Some(["[0000-00-00 00:00:00.000] [logger-name] [info] test payload { a=true b=text }"]),
422+
vec![
423+
YEAR_RANGE,
424+
MONTH_RANGE,
425+
DAY_RANGE,
426+
HOUR_RANGE,
427+
MINUTE_RANGE,
428+
SECOND_RANGE,
429+
MILLISECOND_RANGE,
430+
],
431+
);
436432

437433
check!("{level}", Some(["info"]), vec![]);
438434
check!("{level_short}", Some(["I"]), vec![]);
439-
cfg_if! {
440-
if #[cfg(feature = "source-location")] {
441-
check!("{source}", Some([format!("{}:000", file!())]), vec![SOURCE_RANGE]);
442-
check!("{file_name}", Some(["pattern.rs"]), vec![]);
443-
check!("{file}", Some([file!()]), vec![]);
444-
check!("{line}", Some(["000"]), vec![SOURCE_RANGE]);
445-
check!("{column}", Some(["0"]), vec![SOURCE_RANGE]);
446-
check!("{module_path}", Some([module_path!()]), vec![]);
447-
} else {
448-
check!("{source}", Some([""]), vec![]);
449-
check!("{file_name}", Some([""]), vec![]);
450-
check!("{file}", Some([""]), vec![]);
451-
check!("{line}", Some([""]), vec![]);
452-
check!("{column}", Some([""]), vec![]);
453-
check!("{module_path}", Some([""]), vec![]);
454-
}
435+
#[cfg(feature = "source-location")]
436+
{
437+
check!(
438+
"{source}",
439+
Some([format!("{}:000", file!())]),
440+
vec![SOURCE_RANGE]
441+
);
442+
check!("{file_name}", Some(["pattern.rs"]), vec![]);
443+
check!("{file}", Some([file!()]), vec![]);
444+
check!("{line}", Some(["000"]), vec![SOURCE_RANGE]);
445+
check!("{column}", Some(["0"]), vec![SOURCE_RANGE]);
446+
check!("{module_path}", Some([module_path!()]), vec![]);
447+
}
448+
#[cfg(not(feature = "source-location"))]
449+
{
450+
check!("{source}", Some([""]), vec![]);
451+
check!("{file_name}", Some([""]), vec![]);
452+
check!("{file}", Some([""]), vec![]);
453+
check!("{line}", Some([""]), vec![]);
454+
check!("{column}", Some([""]), vec![]);
455+
check!("{module_path}", Some([""]), vec![]);
455456
}
456457
check!("{logger}", Some(["logger-name"]), vec![]);
457458
check!("{payload}", Some(["test payload"]), vec![]);

0 commit comments

Comments
 (0)