fix(vm): restore branch checks after rebase

Author: drew

crates/openshell-cli/src/run.rs

@@ -6116,6 +6116,7 @@ mod tests {
             edge_team_domain: None,
             edge_auth_url: None,
             vm_driver_state_dir: None,
+            ..Default::default()
         };
 
         assert!(!dockerfile_sources_supported_for_gateway(Some(&metadata)));
@@ -6134,6 +6135,7 @@ mod tests {
             edge_team_domain: None,
             edge_auth_url: None,
             vm_driver_state_dir: None,
+            ..Default::default()
         };
 
         assert!(dockerfile_sources_supported_for_gateway(Some(&metadata)));

crates/openshell-driver-vm/build.rs

@@ -114,7 +114,7 @@ fn main() {
                 e
             )
         });
-        let size = fs::metadata(&dst_path).map(|m| m.len()).unwrap_or(0);
+        let size = fs::metadata(&dst_path).map_or(0, |m| m.len());
         println!("cargo:warning=Embedded {src_name}: {size} bytes");
     }