style: fix all unexpected cfgs (#1648)

Testing in https://github.com/MingweiSamuel/hydroflow https://github.com/MingweiSamuel/hydroflow/actions/runs/12777967961/job/35619880542
hydro-project · Jan 14, 2025 · 8b3b608 · 8b3b608
1 parent c7d2152
commit 8b3b608
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dfir_rs/tests/surface_examples.rs b/dfir_rs/tests/surface_examples.rs
@@ -11,11 +11,7 @@ fn test_all() {
     let examples_files = read_dir("examples/")
         .unwrap()
         .flat_map(Result::ok)
-        .filter(|entry| {
-            entry
-                .file_type()
-                .map_or(false, |file_type| file_type.is_file())
-        })
+        .filter(|entry| entry.file_type().is_ok_and(|file_type| file_type.is_file()))
         .map(|entry| entry.file_name())
         .map(|filename| filename.into_string().unwrap())
         .filter(|filename| filename.starts_with("example_") && filename.ends_with(".rs"))

diff --git a/hydro_deploy/core/src/deployment.rs b/hydro_deploy/core/src/deployment.rs
@@ -1,3 +1,8 @@
+#![allow(
+    unexpected_cfgs,
+    reason = "https://github.com/BrynCooke/buildstructor/issues/192"
+)]
+
 use std::collections::HashMap;
 use std::future::Future;
 use std::sync::{Arc, Weak};

diff --git a/hydro_deploy/core/src/hydroflow_crate/tracing_options.rs b/hydro_deploy/core/src/hydroflow_crate/tracing_options.rs
@@ -1,4 +1,8 @@
 #![allow(clippy::too_many_arguments, reason = "buildstructor")]
+#![allow(
+    unexpected_cfgs,
+    reason = "https://github.com/BrynCooke/buildstructor/issues/192"
+)]
 
 use std::path::PathBuf;
 

diff --git a/multiplatform_test/src/lib.rs b/multiplatform_test/src/lib.rs
@@ -51,9 +51,7 @@ impl Platform {
             Platform::Tokio => quote! { #[tokio::test ] },
             Platform::AsyncStd => quote! { #[async_std::test] },
             Platform::Dfir => quote! { #[dfir_rs::test] },
-            Platform::Wasm => {
-                quote! { #[wasm_bindgen_test::wasm_bindgen_test] }
-            }
+            Platform::Wasm => quote! { #[wasm_bindgen_test::wasm_bindgen_test] },
             Platform::EnvLogging | Platform::EnvTracing => Default::default(),
         }
     }

diff --git a/stageleft/src/lib.rs b/stageleft/src/lib.rs
@@ -54,16 +54,17 @@ macro_rules! stageleft_crate {
             "lib_macro.rs"
         ));
 
-        #[cfg(not(feature = "stageleft_devel"))]
         #[cfg(not(stageleft_macro))]
         #[doc(hidden)]
         #[allow(
             unused,
             ambiguous_glob_reexports,
+            unexpected_cfgs,
             clippy::suspicious_else_formatting,
             reason = "generated code"
         )]
         pub mod __staged {
+            #[cfg(not(feature = "stageleft_devel"))]
             include!(concat!(
                 env!("OUT_DIR"),
                 $crate::PATH_SEPARATOR!(),
@@ -76,16 +77,17 @@ macro_rules! stageleft_crate {
 #[macro_export]
 macro_rules! stageleft_no_entry_crate {
     () => {
-        #[cfg(not(feature = "stageleft_devel"))]
         #[doc(hidden)]
         #[allow(
             unused,
             ambiguous_glob_reexports,
+            unexpected_cfgs,
             clippy::suspicious_else_formatting,
             clippy::type_complexity,
             reason = "generated code"
         )]
         pub mod __staged {
+            #[cfg(not(feature = "stageleft_devel"))]
             include!(concat!(
                 env!("OUT_DIR"),
                 $crate::PATH_SEPARATOR!(),

diff --git a/stageleft_tool/src/lib.rs b/stageleft_tool/src/lib.rs
@@ -321,16 +321,22 @@ pub fn gen_final_helper() {
     )
     .unwrap();
 
-    println!("cargo::rustc-check-cfg=cfg(stageleft_macro)");
     println!("cargo::rerun-if-changed=build.rs");
     println!("cargo::rerun-if-changed=src");
 }
 
 #[macro_export]
 macro_rules! gen_final {
     () => {
-        #[allow(unexpected_cfgs)]
-        #[cfg(not(feature = "stageleft_devel"))]
-        $crate::gen_final_helper()
+        #[allow(
+            unexpected_cfgs,
+            reason = "Consumer crates may optionally add the `stageleft_devel` feature."
+        )]
+        {
+            println!("cargo::rustc-check-cfg=cfg(stageleft_macro)");
+
+            #[cfg(not(feature = "stageleft_devel"))]
+            $crate::gen_final_helper()
+        }
     };
 }