Take FileDataSource by reference in create_fat_filesystem

Author: phil-opp

src/fat.rs

@@ -7,7 +7,7 @@ use std::{collections::BTreeMap, fs, path::Path};
 use crate::KERNEL_FILE_NAME;
 
 pub fn create_fat_filesystem(
-    files: BTreeMap<&str, FileDataSource>,
+    files: BTreeMap<&str, &FileDataSource>,
     out_fat_path: &Path,
 ) -> anyhow::Result<()> {
     const MB: u64 = 1024 * 1024;
@@ -58,7 +58,7 @@ pub fn create_fat_filesystem(
 
 pub fn add_files_to_image(
     root_dir: &Dir<&File>,
-    files: BTreeMap<&str, FileDataSource>,
+    files: BTreeMap<&str, &FileDataSource>,
 ) -> anyhow::Result<()> {
     for (target_path_raw, source) in files {
         let target_path = Path::new(target_path_raw);

src/lib.rs

@@ -199,14 +199,14 @@ impl DiskImageBuilder {
         &self,
         internal_files: BTreeMap<&str, FileDataSource>,
     ) -> anyhow::Result<NamedTempFile> {
-        let mut local_map = BTreeMap::new();
+        let mut local_map: BTreeMap<&str, _> = BTreeMap::new();
 
-        for f in &self.files {
-            local_map.insert(f.0.as_str(), f.1.clone());
+        for (name, source) in &self.files {
+            local_map.insert(&name, source);
         }
 
         for k in internal_files {
-            if local_map.insert(k.0, k.1).is_some() {
+            if local_map.insert(k.0, &k.1).is_some() {
                 return Err(anyhow::Error::msg(format!(
                     "Attempted to overwrite internal file: {}",
                     k.0