Move std::process::exit out of anything nested

src/config/install_hot_keys.rs

@@ -104,17 +104,20 @@ pub fn install_hot_keys() -> HttmResult<()> {
  ) {
  Ok(_) => {
  eprintln!("httm: zsh hot keys were installed successfully.");
- std::process::exit(0)
  }
  Err(err) => {
- Err(HttmError::with_context("httm: could not move .httm-key-bindings.zsh.tmp to .httm-key-bindings.zsh for the following reason: ", &err).into())
+ return Err(HttmError::with_context("httm: could not move .httm-key-bindings.zsh.tmp to .httm-key-bindings.zsh for the following reason: ", &err).into())
  }
  }
  }
- Err(err) => Err(HttmError::with_context(
- "Opening ~/.httm-key-bindings.zsh.tmp file failed for the following reason: ",
- &err,
- )
- .into()),
+ Err(err) => {
+ return Err(HttmError::with_context(
+ "Opening ~/.httm-key-bindings.zsh.tmp file failed for the following reason: ",
+ &err,
+ )
+ .into())
+ }
  }
+
+ std::process::exit(0)
 }

src/exec/interactive.rs

@@ -118,10 +118,12 @@ impl InteractiveSelect {
  // one only allow one to select one path string during select
  // but we retain paths_selected_in_browse because we may need
  // it later during restore if opt_overwrite is selected
- InteractiveMode::Restore(_) => InteractiveRestore::exec(select_result),
- InteractiveMode::Select(select_mode) => select_result.print_selections(select_mode),
+ InteractiveMode::Restore(_) => InteractiveRestore::exec(select_result)?,
+ InteractiveMode::Select(select_mode) => select_result.print_selections(select_mode)?,
  InteractiveMode::Browse => unreachable!(),
  }
+
+ std::process::exit(0);
  }
 
  fn new(browse_result: InteractiveBrowse) -> HttmResult<Self> {
@@ -219,7 +221,7 @@ impl InteractiveSelect {
  .map(Path::new)
  .try_for_each(|snap_path| self.print_snap_path(snap_path, select_mode))?;
 
- std::process::exit(0);
+ Ok(())
  }
 
  fn print_snap_path(&self, snap_path: &Path, select_mode: &SelectMode) -> HttmResult<()> {

src/exec/prune.rs

@@ -38,7 +38,9 @@ impl PruneSnaps {
  false
  };
 
- Self::interactive_prune(&snap_name_map, select_mode)
+ Self::interactive_prune(&snap_name_map, select_mode)?;
+
+ std::process::exit(0)
  }
 
  fn interactive_prune(snap_name_map: &SnapNameMap, select_mode: bool) -> HttmResult<()> {
@@ -97,7 +99,7 @@ impl PruneSnaps {
  }
  }
 
- std::process::exit(0)
+ Ok(())
  }
 
  fn prune_snaps(snap_name_map: &SnapNameMap) -> HttmResult<()> {