eh: format again
Signed-off-by: NotAShelf <raf@notashelf.dev> Change-Id: Ie28cd72b8bc00f2c726dd761be4c15d06a6a6964
This commit is contained in:
parent
6a7941fc74
commit
ef699f6d20
3 changed files with 15 additions and 8 deletions
|
|
@ -36,28 +36,28 @@ pub enum Command {
|
||||||
/// Run a Nix derivation
|
/// Run a Nix derivation
|
||||||
Run {
|
Run {
|
||||||
#[arg(short, long, default_value = "false")]
|
#[arg(short, long, default_value = "false")]
|
||||||
ask: bool,
|
ask: bool,
|
||||||
#[arg(trailing_var_arg = true)]
|
#[arg(trailing_var_arg = true)]
|
||||||
args: Vec<String>,
|
args: Vec<String>,
|
||||||
},
|
},
|
||||||
/// Enter a Nix shell
|
/// Enter a Nix shell
|
||||||
Shell {
|
Shell {
|
||||||
#[arg(short, long, default_value = "false")]
|
#[arg(short, long, default_value = "false")]
|
||||||
ask: bool,
|
ask: bool,
|
||||||
#[arg(trailing_var_arg = true)]
|
#[arg(trailing_var_arg = true)]
|
||||||
args: Vec<String>,
|
args: Vec<String>,
|
||||||
},
|
},
|
||||||
/// Build a Nix derivation
|
/// Build a Nix derivation
|
||||||
Build {
|
Build {
|
||||||
#[arg(short, long, default_value = "false")]
|
#[arg(short, long, default_value = "false")]
|
||||||
ask: bool,
|
ask: bool,
|
||||||
#[arg(trailing_var_arg = true)]
|
#[arg(trailing_var_arg = true)]
|
||||||
args: Vec<String>,
|
args: Vec<String>,
|
||||||
},
|
},
|
||||||
/// Enter a Nix development shell
|
/// Enter a Nix development shell
|
||||||
Develop {
|
Develop {
|
||||||
#[arg(short, long, default_value = "false")]
|
#[arg(short, long, default_value = "false")]
|
||||||
ask: bool,
|
ask: bool,
|
||||||
#[arg(trailing_var_arg = true)]
|
#[arg(trailing_var_arg = true)]
|
||||||
args: Vec<String>,
|
args: Vec<String>,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
use std::{env, path::Path};
|
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 eh::{Cli, Command, CommandFactory, Parser, Shell as EhShell};
|
||||||
use yansi::Paint;
|
use yansi::Paint;
|
||||||
|
|
||||||
|
|
@ -30,7 +30,11 @@ fn main() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_command(command: &str, args: &[String], ask: bool) -> error::Result<i32> {
|
fn handle_command(
|
||||||
|
command: &str,
|
||||||
|
args: &[String],
|
||||||
|
ask: bool,
|
||||||
|
) -> error::Result<i32> {
|
||||||
let hash_extractor = hash::RegexHashExtractor;
|
let hash_extractor = hash::RegexHashExtractor;
|
||||||
let fixer = hash::DefaultNixFileFixer;
|
let fixer = hash::DefaultNixFileFixer;
|
||||||
let classifier = retry::DefaultNixErrorClassifier;
|
let classifier = retry::DefaultNixErrorClassifier;
|
||||||
|
|
@ -130,7 +134,9 @@ fn run_app() -> error::Result<i32> {
|
||||||
|
|
||||||
Some(Command::Build { ask, args }) => handle_command("build", &args, ask),
|
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),
|
Some(Command::Info { args }) => handle_command("info", &args, false),
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -327,7 +327,8 @@ fn handle_hash_mismatch(
|
||||||
if !std::io::stdin().is_terminal() {
|
if !std::io::stdin().is_terminal() {
|
||||||
if ctx.ask {
|
if ctx.ask {
|
||||||
return Err(EhError::Io(std::io::Error::other(
|
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)",
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue