Fix iter if value is None

Signed-off-by: Zvonko Kaiser <[email protected]>

Author: zvonkok

src/cache.rs

@@ -78,14 +78,7 @@ pub struct Cache {
 }
 
 pub fn new_cache(options: Vec<CdiOption>) -> Arc<Mutex<Cache>> {
-    let cache = Arc::new(Mutex::new(Cache {
-        spec_dirs: Vec::new(),
-        specs: HashMap::new(),
-        devices: HashMap::new(),
-        errors: HashMap::new(),
-        dir_errors: HashMap::new(),
-        auto_refresh: true,
-    }));
+    let cache = Arc::new(Mutex::new(Cache::default()));
 
     {
         let mut c = cache.lock().unwrap();
@@ -273,10 +266,11 @@ impl Cache {
             if let Some(dev) = self.devices.get(&device) {
                 let mut spec = dev.get_spec();
                 if specs.insert(spec.clone()) {
-                    match spec.edits() {
-                        Some(ce) => edits.append(ce)?,
-                        None => continue,
-                    };
+                    // spec.edits may be none when we only have dev.edits
+                    // allow dev.edits to be added even if spec.edits is None
+                    if let Some(ce) = spec.edits() {
+                        edits.append(ce)?
+                    }
                 }
                 edits.append(dev.edits())?;
             } else {

src/version.rs

@@ -165,7 +165,7 @@ fn requires_v040(spec: &CDISpec) -> bool {
     spec.devices
         .iter()
         .map(|d| &d.container_edits)
-        .chain(std::iter::once(spec.container_edits.as_ref().unwrap()))
+        .chain(spec.container_edits.as_ref())
         .flat_map(|edits| edits.mounts.iter().flat_map(|mounts| mounts.iter()))
         .any(|mount| mount.r#type.as_ref().map_or(false, |typ| !typ.is_empty()))
 }