mirror of
https://github.com/martinvonz/jj.git
synced 2024-10-24 07:32:54 +00:00
cli: don't use clap::Error
since it's too generic
It's not obvious when you see `Error`, even in the CLI crate, that it's a `clap::Error`
This commit is contained in:
parent
3ccdd1f98a
commit
4a4aebd3bc
1 changed files with 2 additions and 3 deletions
|
@ -23,9 +23,8 @@ use std::process::ExitCode;
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use clap;
|
|
||||||
use clap::builder::{NonEmptyStringValueParser, TypedValueParser, ValueParserFactory};
|
use clap::builder::{NonEmptyStringValueParser, TypedValueParser, ValueParserFactory};
|
||||||
use clap::{Arg, ArgAction, ArgMatches, Command, Error, FromArgMatches};
|
use clap::{Arg, ArgAction, ArgMatches, Command, FromArgMatches};
|
||||||
use git2::{Oid, Repository};
|
use git2::{Oid, Repository};
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
use jujutsu_lib::backend::{BackendError, ChangeId, CommitId, ObjectId, TreeId};
|
use jujutsu_lib::backend::{BackendError, ChangeId, CommitId, ObjectId, TreeId};
|
||||||
|
@ -1700,7 +1699,7 @@ impl TypedValueParser for RevisionArgValueParser {
|
||||||
cmd: &Command,
|
cmd: &Command,
|
||||||
arg: Option<&Arg>,
|
arg: Option<&Arg>,
|
||||||
value: &OsStr,
|
value: &OsStr,
|
||||||
) -> Result<Self::Value, Error> {
|
) -> Result<Self::Value, clap::Error> {
|
||||||
let string = NonEmptyStringValueParser::new().parse(cmd, arg, value.to_os_string())?;
|
let string = NonEmptyStringValueParser::new().parse(cmd, arg, value.to_os_string())?;
|
||||||
Ok(RevisionArg(string))
|
Ok(RevisionArg(string))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue