fix: adapt testing and CI to the newly optional std feature for

env_filter

Some parts of the tests are skipped with no_std as they require
`snapbox::str!` which does not support no_std.

Author: cagatay-y

.github/workflows/ci.yml

@@ -72,7 +72,13 @@ jobs:
     - uses: Swatinem/rust-cache@v2
     - uses: taiki-e/install-action@cargo-hack
     - name: Default features
-      run: cargo hack check --each-feature --locked --rust-version --ignore-private --workspace --all-targets --keep-going
+      run:
+        - cargo hack check --each-feature --locked --rust-version --ignore-private --package env_logger --all-targets --keep-going
+        # When the std feature is enabled, a lower MSRV of 1.71 is sufficient and was the MSRV for the crate before std was made optional.
+        # To make sure we keep it that way, check configurations with std enabled and disabled separately and with their respective MSRVs.
+        # "--at-least-one-of" requires "--feature-powerset", which can be made to emulate "--each-feature" with "--depth 1".
+        - cargo hack check --feature-powerset --depth 1 --locked --version-range 1.71..=1.71 --ignore-private --package env_filter --all-targets --keep-going --at-least-one-of std,default,regex
+        - cargo hack check --no-default-features --locked --version-range 1.81..=1.81 --ignore-private --package env_filter --all-targets --keep-going
   minimal-versions:
     name: Minimal versions
     strategy:

Cargo.toml

@@ -135,7 +135,7 @@ unstable-kv = ["kv"]
 
 [dependencies]
 log = { version = "0.4.29", features = ["std"] }
-env_filter = { version = "1.0.0", path = "crates/env_filter", default-features = false }
+env_filter = { version = "1.0.0", path = "crates/env_filter", default-features = false, features = ["std"] }
 jiff = { version = "0.2.22", default-features = false, features = ["std"], optional = true }
 anstream = { version = "1.0.0", default-features = false, features = ["wincon"], optional = true }
 anstyle = { version = "1.0.13", optional = true }

crates/env_filter/Cargo.toml

@@ -9,7 +9,6 @@ keywords = ["logging", "log", "logger"]
 repository.workspace = true
 license.workspace = true
 edition.workspace = true
-rust-version.workspace = true
 include.workspace = true
 
 [package.metadata.docs.rs]

crates/env_filter/src/filter.rs

@@ -5,6 +5,7 @@ use log::{LevelFilter, Metadata, Record};
 
 use crate::enabled;
 use crate::parse_spec;
+use crate::parser::ParseResult;
 use crate::Directive;
 use crate::FilterOp;
 use crate::ParseError;
@@ -97,18 +98,20 @@ impl Builder {
     /// See the [Enabling Logging] section for more details.
     ///
     /// [Enabling Logging]: ../index.html#enabling-logging
-    #[cfg(feature = "std")]
     pub fn parse(&mut self, filters: &str) -> &mut Self {
         #![allow(clippy::print_stderr)] // compatibility
 
-        let crate::parser::ParseResult {
+        let ParseResult {
             directives,
             filter,
             errors,
         } = parse_spec(filters);
 
         for error in errors {
+            #[cfg(feature = "std")]
             eprintln!("warning: {error}, ignoring it");
+            #[cfg(not(feature = "std"))]
+            log::warn!("{error}, ignoring it");
         }
 
         self.filter = filter;
@@ -258,8 +261,9 @@ impl fmt::Debug for Filter {
 
 #[cfg(test)]
 mod tests {
+    use alloc::{borrow::ToOwned, vec, vec::Vec};
+
     use log::{Level, LevelFilter};
-    use snapbox::{assert_data_eq, str};
 
     use super::{enabled, Builder, Directive, Filter};
 
@@ -486,10 +490,12 @@ mod tests {
 
     #[test]
     fn try_parse_invalid_filter() {
+        #[allow(unused_variables)]
         let error = Builder::new().try_parse("info,crate1=invalid").unwrap_err();
-        assert_data_eq!(
+        #[cfg(feature = "std")]
+        snapbox::assert_data_eq!(
             error,
-            str!["error parsing logger filter: invalid logging spec 'invalid'"]
+            snapbox::str!["error parsing logger filter: invalid logging spec 'invalid'"]
         );
     }
 

crates/env_filter/src/parser.rs

@@ -120,9 +120,13 @@ pub(crate) fn parse_spec(spec: &str) -> ParseResult {
 
 #[cfg(test)]
 mod tests {
+    use alloc::{borrow::ToOwned, string::ToString};
+
     use crate::ParseError;
     use log::LevelFilter;
-    use snapbox::{assert_data_eq, str, Data, IntoData};
+    #[cfg(feature = "std")]
+    use snapbox::{assert_data_eq, str};
+    use snapbox::{Data, IntoData};
 
     use super::{parse_spec, ParseResult};
 
@@ -169,6 +173,7 @@ mod tests {
         assert!(filter.is_none());
 
         assert_eq!(errors.len(), 1);
+        #[cfg(feature = "std")]
         assert_data_eq!(
             &errors[0],
             str!["invalid logging spec 'crate1::mod1=warn=info'"]
@@ -190,6 +195,7 @@ mod tests {
         assert!(filter.is_none());
 
         assert_eq!(errors.len(), 1);
+        #[cfg(feature = "std")]
         assert_data_eq!(&errors[0], str!["invalid logging spec 'noNumber'"]);
     }
 
@@ -208,6 +214,7 @@ mod tests {
         assert!(filter.is_none());
 
         assert_eq!(errors.len(), 1);
+        #[cfg(feature = "std")]
         assert_data_eq!(&errors[0], str!["invalid logging spec 'wrong'"]);
     }
 
@@ -226,6 +233,7 @@ mod tests {
         assert!(filter.is_none());
 
         assert_eq!(errors.len(), 1);
+        #[cfg(feature = "std")]
         assert_data_eq!(&errors[0], str!["invalid logging spec 'wrong'"]);
     }
 
@@ -399,6 +407,7 @@ mod tests {
         assert!(filter.is_some() && filter.unwrap().to_string() == "a.c");
 
         assert_eq!(errors.len(), 1);
+        #[cfg(feature = "std")]
         assert_data_eq!(
             &errors[0],
             str!["invalid logging spec 'crate1::mod1=error=warn'"]
@@ -430,6 +439,7 @@ mod tests {
         assert!(filter.is_none());
 
         assert_eq!(errors.len(), 1);
+        #[cfg(feature = "std")]
         assert_data_eq!(
             &errors[0],
             str!["invalid logging spec 'debug/abc/a.c' (too many '/'s)"]
@@ -451,14 +461,17 @@ mod tests {
         assert!(filter.is_none());
 
         assert_eq!(errors.len(), 2);
-        assert_data_eq!(
-            &errors[0],
-            str!["invalid logging spec 'crate1::mod1=warn=info'"]
-        );
-        assert_data_eq!(
-            &errors[1],
-            str!["invalid logging spec 'crate3=error=error'"]
-        );
+        #[cfg(feature = "std")]
+        {
+            assert_data_eq!(
+                &errors[0],
+                str!["invalid logging spec 'crate1::mod1=warn=info'"]
+            );
+            assert_data_eq!(
+                &errors[1],
+                str!["invalid logging spec 'crate3=error=error'"]
+            );
+        }
     }
 
     #[test]
@@ -476,8 +489,11 @@ mod tests {
         assert!(filter.is_none());
 
         assert_eq!(errors.len(), 2);
-        assert_data_eq!(&errors[0], str!["invalid logging spec 'noNumber'"]);
-        assert_data_eq!(&errors[1], str!["invalid logging spec 'invalid'"]);
+        #[cfg(feature = "std")]
+        {
+            assert_data_eq!(&errors[0], str!["invalid logging spec 'noNumber'"]);
+            assert_data_eq!(&errors[1], str!["invalid logging spec 'invalid'"]);
+        }
     }
 
     #[test]
@@ -495,18 +511,23 @@ mod tests {
         assert!(filter.is_none());
 
         assert_eq!(errors.len(), 2);
-        assert_data_eq!(
-            &errors[0],
-            str!["invalid logging spec 'crate1::mod1=debug=info'"]
-        );
-        assert_data_eq!(&errors[1], str!["invalid logging spec 'invalid'"]);
+        #[cfg(feature = "std")]
+        {
+            assert_data_eq!(
+                &errors[0],
+                str!["invalid logging spec 'crate1::mod1=debug=info'"]
+            );
+            assert_data_eq!(&errors[1], str!["invalid logging spec 'invalid'"]);
+        }
     }
 
     #[test]
     fn parse_error_message_single_error() {
+        #[allow(unused_variables)]
         let error = parse_spec("crate1::mod1=debug=info,crate2=debug")
             .ok()
             .unwrap_err();
+        #[cfg(feature = "std")]
         assert_data_eq!(
             error,
             str!["error parsing logger filter: invalid logging spec 'crate1::mod1=debug=info'"]
@@ -515,9 +536,11 @@ mod tests {
 
     #[test]
     fn parse_error_message_multiple_errors() {
+        #[allow(unused_variables)]
         let error = parse_spec("crate1::mod1=debug=info,crate2=debug,crate3=invalid")
             .ok()
             .unwrap_err();
+        #[cfg(feature = "std")]
         assert_data_eq!(
             error,
             str!["error parsing logger filter: invalid logging spec 'crate1::mod1=debug=info'"]