cargo fmt --all

Author: korewaChino

src/backend/install.rs

@@ -253,7 +253,7 @@ impl InstallationState {
     fn setup_system(&self, output: RepartOutput, passphrase: Option<&str>) -> Result<()> {
         // XXX: This is a bit hacky, but this function should be called before output.generate_fstab() for
         // the fstab generator to be correct, IF we're using encryption
-        // 
+        //
         // todo: Unfuck this
         let mut container = output.to_container(passphrase)?;
 

src/backend/postinstall/cryptsetup.rs

@@ -10,7 +10,7 @@ pub struct CryptSetup;
 impl PostInstallModule for CryptSetup {
     fn run(&self, context: &Context) -> Result<()> {
         let mut f = std::fs::File::create("/etc/crypttab")?;
-        
+
         f.write_all(b"# This file is generated by Readymade.\n")?;
         // need to get partition list???
 

src/backend/postinstall/grub2.rs

@@ -127,20 +127,20 @@ impl PostInstallModule for GRUB2 {
     fn run(&self, context: &Context) -> Result<()> {
         stage!("Generating system grub defaults" {
             let mut defaults = Grub2Defaults::default();
-            
+
             // Now, let's add extra boot opts if they exist
             if let Some(crypt_data) = &context.crypt_data {
                 // prepend
                 let current_value = defaults.cmdline_linux.clone();
-                
+
                 // this is a mess.
                 // todo: In the event someone thinks this code stinks, please please PLEASE refactor it for us.
-                
+
                 let joined_cmdline = crypt_data.cmdline_opts.join(" ");
                 tracing::info!("Adding cryptsetup cmdline options: {}", joined_cmdline);
                 defaults.cmdline_linux = format!("{} {}", joined_cmdline, current_value);
             }
-            
+
             let defaults_str = defaults.generate();
             std::fs::write("/etc/default/grub", defaults_str)?;
         });

src/backend/postinstall/mod.rs

@@ -16,6 +16,7 @@ use std::path::PathBuf;
 use super::repart_output::CryptData;
 
 pub mod cleanup_boot;
+pub mod cryptsetup;
 pub mod dracut;
 pub mod efi_stub;
 pub mod grub2;
@@ -24,7 +25,6 @@ pub mod language;
 pub mod prepare_fedora;
 pub mod reinstall_kernel;
 pub mod selinux;
-pub mod cryptsetup;
 
 pub struct Context {
     pub destination_disk: PathBuf,

src/backend/repart_output.rs

@@ -55,7 +55,7 @@ impl MapperCache {
     fn insert(&mut self, node: String, path: PathBuf) {
         self.cache.insert(node, path);
     }
-    
+
     fn clear(&mut self) {
         for (node, path) in self.cache.drain() {
             if let Err(e) = cryptsetup_close(&path.to_string_lossy()) {
@@ -431,19 +431,19 @@ impl RepartPartition {
             // - Finding the UUID of the mapper device by doing some symlink magic (thanks udev!)
             // - Using that UUID for the fstab entry
 
-            
             // We're gonna be abusing the mapper cache, which should be populated by the time we get here
-            
+
             let mapper_cache = MAPPER_CACHE.read().unwrap();
             let mapper_path = mapper_cache.get(&self.node).unwrap();
-            
 
             tracing::trace!(?mapper_path, "Guessed mapper path as this");
 
             // Thankfully, since we made lsblk-rs we can do this easily.
             let device = lsblk::BlockDevice::from_path(&mapper_path)?;
             tracing::trace!(?device, "Found device from mapper path");
-            let uuid = device.uuid.ok_or_eyre("Could not find UUID of decrypted device")?;
+            let uuid = device
+                .uuid
+                .ok_or_eyre("Could not find UUID of decrypted device")?;
 
             // The mapper path should be a symlink to the /dev/dm-XX device
 

src/backend/repartcfg.rs

@@ -411,4 +411,4 @@ impl EncryptOption {
     pub const fn is_on(self) -> bool {
         !matches!(self, EncryptOption::Off)
     }
-}
+}

src/main.rs

@@ -213,8 +213,6 @@ fn main() -> Result<()> {
 
         IPC_CHANNEL.set(Mutex::new(channel)).unwrap();
         let install_state: InstallationState = serde_json::from_reader(std::io::stdin())?;
-        
-
 
         return install_state.install();
     }
@@ -268,9 +266,9 @@ fn setup_hooks() -> impl std::any::Any {
             std::env::set_var(key, value);
         }
     }
-    
+
     let is_non_interactive = std::env::args().any(|arg| arg == "--non-interactive");
-    
+
     let readymade_log_file = if !is_non_interactive {
         "readymade.log"
     } else {