i hate my life right now

crabnebula-dev · Sep 21, 2023 · 98fb275 · 98fb275
1 parent 0fd7b0e
commit 98fb275
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/crates/packager/src/package/app/mod.rs b/crates/packager/src/package/app/mod.rs
@@ -42,17 +42,13 @@ pub(crate) fn package(ctx: &Context) -> crate::Result<Vec<PathBuf>> {
     dbg!(&bin_dir);
     dbg!(&std::fs::read_dir(config.out_dir())?
         .map(|res| res.map(|e| e.path()))
-        .collect::<Result<Vec<_>, std::io::Error>>()?
-        .into_iter()
-        .flatten());
+        .collect::<Result<Vec<_>, std::io::Error>>()?);
     for bin in &config.binaries {
         let bin_path = config.binary_path(bin);
         dbg!(&bin_path);
         dbg!(&std::fs::read_dir(bin_path.parent().unwrap())?
             .map(|res| res.map(|e| e.path()))
-            .collect::<Result<Vec<_>, std::io::Error>>()?
-            .into_iter()
-            .flatten());
+            .collect::<Result<Vec<_>, std::io::Error>>()?);
         std::fs::copy(&bin_path, bin_dir.join(&bin.filename))?;
     }
 

diff --git a/crates/packager/src/package/deb/mod.rs b/crates/packager/src/package/deb/mod.rs
@@ -147,17 +147,13 @@ pub fn generate_data(config: &Config, data_dir: &Path) -> crate::Result<BTreeSet
     dbg!(&bin_dir);
     dbg!(&std::fs::read_dir(config.out_dir())?
         .map(|res| res.map(|e| e.path()))
-        .collect::<Result<Vec<_>, std::io::Error>>()?
-        .into_iter()
-        .flatten());
+        .collect::<Result<Vec<_>, std::io::Error>>()?);
     for bin in config.binaries.iter() {
         let bin_path = config.binary_path(bin);
         dbg!(&bin_path);
         dbg!(&std::fs::read_dir(bin_path.parent().unwrap())?
             .map(|res| res.map(|e| e.path()))
-            .collect::<Result<Vec<_>, std::io::Error>>()?
-            .into_iter()
-            .flatten());
+            .collect::<Result<Vec<_>, std::io::Error>>()?);
         std::fs::copy(&bin_path, bin_dir.join(&bin.filename))?;
     }