diff --git a/eh/src/lib.rs b/eh/src/lib.rs index 0d6a5dd..9e9f0ea 100644 --- a/eh/src/lib.rs +++ b/eh/src/lib.rs @@ -36,28 +36,28 @@ pub enum Command { /// Run a Nix derivation Run { #[arg(short, long, default_value = "false")] - ask: bool, + ask: bool, #[arg(trailing_var_arg = true)] args: Vec, }, /// Enter a Nix shell Shell { #[arg(short, long, default_value = "false")] - ask: bool, + ask: bool, #[arg(trailing_var_arg = true)] args: Vec, }, /// Build a Nix derivation Build { #[arg(short, long, default_value = "false")] - ask: bool, + ask: bool, #[arg(trailing_var_arg = true)] args: Vec, }, /// Enter a Nix development shell Develop { #[arg(short, long, default_value = "false")] - ask: bool, + ask: bool, #[arg(trailing_var_arg = true)] args: Vec, }, diff --git a/eh/src/main.rs b/eh/src/main.rs index 9df68ab..3dcd844 100644 --- a/eh/src/main.rs +++ b/eh/src/main.rs @@ -1,6 +1,6 @@ use std::{env, path::Path}; -use clap_complete::{generate, Shell}; +use clap_complete::{Shell, generate}; use eh::{Cli, Command, CommandFactory, Parser, Shell as EhShell}; use yansi::Paint; @@ -30,7 +30,11 @@ fn main() { } } -fn handle_command(command: &str, args: &[String], ask: bool) -> error::Result { +fn handle_command( + command: &str, + args: &[String], + ask: bool, +) -> error::Result { let hash_extractor = hash::RegexHashExtractor; let fixer = hash::DefaultNixFileFixer; let classifier = retry::DefaultNixErrorClassifier; @@ -130,7 +134,9 @@ fn run_app() -> error::Result { Some(Command::Build { ask, args }) => handle_command("build", &args, ask), - Some(Command::Develop { ask, args }) => handle_command("develop", &args, ask), + Some(Command::Develop { ask, args }) => { + handle_command("develop", &args, ask) + }, Some(Command::Info { args }) => handle_command("info", &args, false), diff --git a/eh/src/retry.rs b/eh/src/retry.rs index eb04760..917d40f 100644 --- a/eh/src/retry.rs +++ b/eh/src/retry.rs @@ -327,7 +327,8 @@ fn handle_hash_mismatch( if !std::io::stdin().is_terminal() { if ctx.ask { return Err(EhError::Io(std::io::Error::other( - "cannot prompt for hash fix confirmation in non-interactive mode (no TTY)", + "cannot prompt for hash fix confirmation in non-interactive mode (no \ + TTY)", ))); }