fix tests/examples; unify log import handling now that paris doesn't …

…require something different
Drakulix · May 30, 2023 · 1c2c36c · 1c2c36c
1 parent edad110
commit 1c2c36c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/examples/custom_colors.rs b/examples/custom_colors.rs
@@ -1,4 +1,4 @@
-#[cfg(all(feature = "termcolor", not(feature = "paris")))]
+#[cfg(feature = "termcolor")]
 use log::*;
 #[cfg(feature = "termcolor")]
 use simplelog::*;

diff --git a/examples/default_colors.rs b/examples/default_colors.rs
@@ -1,4 +1,4 @@
-#[cfg(all(feature = "termcolor", not(feature = "paris")))]
+#[cfg(feature = "termcolor")]
 use log::*;
 #[cfg(feature = "termcolor")]
 use simplelog::*;

diff --git a/examples/rgb_colors.rs b/examples/rgb_colors.rs
@@ -1,8 +1,4 @@
-#[cfg(all(
-    not(target_family = "windows"),
-    feature = "termcolor",
-    not(feature = "paris")
-))]
+#[cfg(all(not(target_family = "windows"), feature = "termcolor"))]
 use log::*;
 #[cfg(all(not(target_family = "windows"), feature = "termcolor"))]
 use simplelog::*;

diff --git a/examples/usage.rs b/examples/usage.rs
@@ -1,4 +1,3 @@
-#[cfg(not(feature = "paris"))]
 use log::*;
 use simplelog::*;
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -39,7 +39,7 @@ pub use termcolor::{Color, ColorChoice};
 pub use log::{Level, LevelFilter};
 
 use log::Log;
-#[cfg(all(test))]
+#[cfg(test)]
 use log::*;
 
 #[cfg(feature = "paris")]