Skip to content

Commit 1c3c968

Browse files
authored
refactor: adapt new clap-i18n-richformatter (#619)
1 parent 3d21099 commit 1c3c968

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

Cargo.lock

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ textwrap = "0.16.2"
5050
sysinfo = "0.37"
5151
once_cell = "1.21"
5252
itertools = "0.14.0"
53-
clap-i18n-richformatter = "0.1.0"
53+
clap-i18n-richformatter = "0.3.0"
5454
debversion = "0.5"
5555
which = "8"
5656
rayon = "1.11.0"

src/main.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use args::{CliExecuter, OhManagerAilurus};
2525
use clap::builder::FalseyValueParser;
2626
use clap::{ArgAction, ArgMatches, Args, ColorChoice, CommandFactory, FromArgMatches, arg};
2727
use clap_complete::CompleteEnv;
28-
use clap_i18n_richformatter::{ClapI18nRichFormatter, init_clap_rich_formatter_localizer};
28+
use clap_i18n_richformatter::CommandI18nExt;
2929
use error::OutputError;
3030
use i18n_embed::{DesktopLanguageRequester, Localizer};
3131
use lang::LANGUAGE_LOADER;
@@ -164,7 +164,6 @@ fn main() {
164164
libc::setlocale(libc::LC_ALL, s.as_ptr());
165165
}
166166

167-
init_clap_rich_formatter_localizer();
168167
init_localizer();
169168

170169
// 补全
@@ -250,13 +249,7 @@ fn init_apt_config(oma: &OhManagerAilurus) {
250249
}
251250

252251
fn parse_args() -> (ArgMatches, OhManagerAilurus) {
253-
let matches = match OhManagerAilurus::command().try_get_matches() {
254-
Ok(m) => m,
255-
Err(e) => {
256-
let e = e.apply::<ClapI18nRichFormatter>();
257-
e.exit();
258-
}
259-
};
252+
let matches = OhManagerAilurus::command().get_matches_i18n();
260253

261254
let oma = match OhManagerAilurus::from_arg_matches(&matches).map_err(|e| {
262255
let mut cmd = OhManagerAilurus::command();

0 commit comments

Comments
 (0)