clippy

Author: yoramdelangen

build.rs

@@ -232,7 +232,9 @@ fn check_php_version(info: &PHPInfo) -> Result<()> {
 
     const PHP_84_API_VER: u32 = 20240924;
 
-    println!("cargo::rustc-check-cfg=cfg(php80, php81, php82, php83, php84, php_zts, php_debug, docs)");
+    println!(
+        "cargo::rustc-check-cfg=cfg(php80, php81, php82, php83, php84, php_zts, php_debug, docs)"
+    );
     println!("cargo:rustc-cfg=php80");
 
     if (PHP_81_API_VER..PHP_82_API_VER).contains(&version) {

src/zend/function.rs

@@ -39,9 +39,9 @@ impl FunctionEntry {
             num_args: 0,
             flags: 0,
             #[cfg(php84)]
-            frameless_function_infos: ptr::null(),
+            doc_comment: ptr::null(),
             #[cfg(php84)]
-            doc_comment: "".as_ptr() as *const c_char,
+            frameless_function_infos: ptr::null(),
         }
     }
 

src/zend/handlers.rs

@@ -238,15 +238,18 @@ impl ZendObjectHandlers {
                         let mut zv = Zval::new();
                         val.get(self_, &mut zv)?;
 
-                        #[cfg(php84)]
-                        #[allow(clippy::unnecessary_mut_passed)]
-                        if zend_is_true(&mut zv) {
-                            return Ok(1);
-                        }
-
-                        #[cfg(not(php84))]
-                        if zend_is_true(&mut zv) == 1 {
-                            return Ok(1);
+                        cfg_if::cfg_if! {
+                            if #[cfg(php84)] {
+                                #[allow(clippy::unnecessary_mut_passed)]
+                                if zend_is_true(&mut zv) {
+                                    return Ok(1);
+                                }
+                            } else {
+                                #[allow(clippy::unnecessary_mut_passed)]
+                                if zend_is_true(&mut zv) == 1 {
+                                    return Ok(1);
+                                }
+                            }
                         }
                     }
                 }