single scope again

src/main.rs

@@ -29,21 +29,21 @@ fn main() -> Result<(), Box<dyn Error>> {
     let args = Args::parse();
 
     #[cfg(not(windows))]
-    let boot_folder = args
+    let boot_folder = unsafe {
-        .boot_directory
+        args.boot_directory
-        .or_else(|| PathBuf::from_str(BOOT_PATH).ok());
+            .or_else(|| PathBuf::from_str(BOOT_PATH).ok())
-
+            .unwrap_unchecked()
-    #[cfg(not(windows))]
+    };
-    let boot_folder = unsafe { boot_folder.unwrap_unchecked() };
 
     #[cfg(windows)]
-    if args.boot_directory.is_none() {
+    let boot_folder = {
-        eprintln!("You must supply a boot-directory on windows; see --help");
+        if args.boot_directory.is_none() {
-        exit(1);
+            eprintln!("You must supply a boot-directory on windows; see --help");
-    }
+            exit(1);
+        }
 
-    #[cfg(windows)]
+        unsafe { args.boot_directory.unwrap_unchecked() }
-    let boot_folder = unsafe { args.boot_directory.unwrap_unchecked() };
+    };
 
     let grub_env = boot_folder.join("grub/grubenv");