~ refine code

milieuim · Nov 22, 2024 · 412b411 · 412b411
1 parent fd6952a
commit 412b411
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/src/cmd/deploy.rs b/src/cmd/deploy.rs
@@ -2,6 +2,7 @@ use std::{
     collections::HashMap,
     fs::{self, Permissions, ReadDir},
     io::{self, ErrorKind},
+    iter,
     os::unix::fs::PermissionsExt,
     path::PathBuf,
     rc::Rc,
@@ -155,7 +156,7 @@ impl Profile {
 
         let templates = self.templates.iter().filter(|i| if_early(i.0));
 
-        let complete = CompleteProfile(vec![self]);
+        let complete = CompleteProfile::from_iter(iter::once(self));
         let ctx = RencCtx::create(&complete);
 
         let plain_map = RencBuilder::create(&complete)
@@ -178,8 +179,8 @@ impl Profile {
                 ))
                 .inspect(|p| {
                     fs::set_permissions(p, Permissions::from_mode(0o751))
-                        .wrap_err(eyre!("set permission"))
-                        .expect("set permission");
+                        .wrap_err(eyre!("set permission failed"))
+                        .unwrap();
                 })?
         };
         macro_rules! generate_dst {
@@ -297,10 +298,8 @@ impl Profile {
 
         match std::fs::remove_file(symlink_dst) {
             Err(e) if e.kind() == io::ErrorKind::NotFound => {}
-            Err(e) => Err(eyre!("{}", e))?,
-            Ok(_) => {
-                debug!("old symlink removed");
-            }
+            e @ Err(_) => e?,
+            _ => debug!("old symlink removed"),
         }
 
         info!(

diff --git a/src/cmd/mod.rs b/src/cmd/mod.rs
@@ -101,10 +101,9 @@ impl Args {
         match &self.app {
             SubCmd::Renc(RencSubCmd { identity, cache }) => {
                 debug!("start re-encrypt secrets");
-                let real_profile = profile()?;
-                let profile: Vec<&Profile> = real_profile.iter().collect();
-                CompleteProfile::from(profile).renc(
-                    flake_root.clone(),
+                let profile = profile()?;
+                CompleteProfile::from_iter(&profile).renc(
+                    flake_root,
                     identity.clone(),
                     cache.into(),
                 )
@@ -123,9 +122,8 @@ impl Args {
             }
             SubCmd::Check(_) => {
                 info!("start checking");
-                let real_profile = profile()?;
-                let profile = real_profile.iter().collect();
-                CompleteProfile(profile).check()?;
+                let profile = profile()?;
+                CompleteProfile::from_iter(&profile).check()?;
                 info!("check complete");
                 Ok(())
             }

diff --git a/src/cmd/renc.rs b/src/cmd/renc.rs
@@ -11,9 +11,9 @@ use std::{fs, path::PathBuf};
 
 pub struct CompleteProfile<'a>(pub Vec<&'a Profile>);
 
-impl<'a> From<Vec<&'a Profile>> for CompleteProfile<'a> {
-    fn from(value: Vec<&'a Profile>) -> Self {
-        Self(value)
+impl<'a> FromIterator<&'a Profile> for CompleteProfile<'a> {
+    fn from_iter<T: IntoIterator<Item = &'a Profile>>(iter: T) -> Self {
+        iter.into_iter().collect()
     }
 }