From ca43a2acb9f9b776161094d6e2b77735cfaaab5a Mon Sep 17 00:00:00 2001 From: ErikWDev Date: Sat, 26 Nov 2022 18:04:01 +0100 Subject: [PATCH] Ensure removal of cfg_if is compatible with MSRV --- src/lib.rs | 59 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 4738fb965..19ada079c 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1506,29 +1506,42 @@ pub const STATIC_MAX_LEVEL: LevelFilter = MAX_LEVEL_INNER; #[rustfmt::skip] const MAX_LEVEL_INNER: LevelFilter = { - if cfg!(all(not(debug_assertions), feature = "release_max_level_off")) { - LevelFilter::Off - } else if cfg!(all(not(debug_assertions), feature = "release_max_level_error")) { - LevelFilter::Error - } else if cfg!(all(not(debug_assertions), feature = "release_max_level_warn")) { - LevelFilter::Warn - } else if cfg!(all(not(debug_assertions), feature = "release_max_level_info")) { - LevelFilter::Info - } else if cfg!(all(not(debug_assertions), feature = "release_max_level_debug")) { - LevelFilter::Debug - } else if cfg!(all(not(debug_assertions), feature = "release_max_level_trace")) { - LevelFilter::Trace - } else if cfg!(feature = "max_level_off") { - LevelFilter::Off - } else if cfg!(feature = "max_level_error") { - LevelFilter::Error - } else if cfg!(feature = "max_level_warn") { - LevelFilter::Warn - } else if cfg!(feature = "max_level_info") { - LevelFilter::Info - } else if cfg!(feature = "max_level_debug") { - LevelFilter::Debug - } else { + #[allow(unreachable_code)] + { + #[cfg(all(not(debug_assertions), feature = "release_max_level_off"))] { + return LevelFilter::Off; + } + #[cfg(all(not(debug_assertions), feature = "release_max_level_error"))] { + return LevelFilter::Error; + } + #[cfg(all(not(debug_assertions), feature = "release_max_level_warn"))] { + return LevelFilter::Warn; + } + #[cfg(all(not(debug_assertions), feature = "release_max_level_info"))] { + return LevelFilter::Info; + } + #[cfg(all(not(debug_assertions), feature = "release_max_level_debug"))] { + return LevelFilter::Debug; + } + #[cfg(all(not(debug_assertions), feature = "release_max_level_trace"))] { + return LevelFilter::Trace; + } + #[cfg(feature = "max_level_off")] { + return LevelFilter::Off; + } + #[cfg(feature = "max_level_error")] { + return LevelFilter::Error; + } + #[cfg(feature = "max_level_warn")] { + return LevelFilter::Warn; + } + #[cfg(feature = "max_level_info")] { + return LevelFilter::Info; + } + #[cfg(feature = "max_level_debug")] { + return LevelFilter::Debug; + } + LevelFilter::Trace } };