Clippy

Author: joehoyle

src/zend/globals.rs

@@ -53,23 +53,20 @@ impl ExecutorGlobals {
 
     /// Retrieves the ini values for all ini directives in the current executor context..
     pub fn ini_values(&self) -> HashMap<String, Option<String>> {
-        let hash_table = unsafe { self.ini_directives.as_ref().unwrap() };
+        let hash_table = unsafe { &*self.ini_directives };
         let mut ini_hash_map: HashMap<String, Option<String>> = HashMap::new();
         for (_index, key, value) in hash_table.iter() {
-            match key {
-                Some(key) => {
-                    ini_hash_map.insert(key, unsafe {
-                        let ini_entry = &*value.ptr::<zend_ini_entry>().unwrap();
-                        if ini_entry.value.is_null() {
-                            None
-                        } else {
-                            Some((&*ini_entry.value).as_str().unwrap().to_owned())
-                        }
-                    });
-                    ()
-                }
-                None => (),
+            if let Some(key) = key {
+                ini_hash_map.insert(key, unsafe {
+                    let ini_entry = &*value.ptr::<zend_ini_entry>().expect("Invalid ini entry");
+                    if ini_entry.value.is_null() {
+                        None
+                    } else {
+                        Some((*ini_entry.value).as_str().expect("Ini value is not a string").to_owned())
+                    }
+                });
             }
+
         }
         ini_hash_map
     }

src/zend/ini_entry_def.rs

@@ -15,8 +15,8 @@ impl IniEntryDef {
     /// Returns an empty ini entry, signifying the end of a ini list.
     pub fn new(name: String, default_value: String, permission: IniEntryPermission) -> Self {
         let mut template = Self::end();
-        let name = CString::new(name).unwrap();
-        let value = CString::new(default_value).unwrap();
+        let name = CString::new(name).expect("Unable to create CString from name");
+        let value = CString::new(default_value).expect("Unable to create CString from value");
         template.name_length = name.as_bytes().len() as _;
         template.name = name.into_raw();
         template.value_length = value.as_bytes().len() as _;