1
1
use std:: io;
2
2
3
- use clap:: { Args , IntoApp , Parser , Subcommand } ;
3
+ use clap:: { Args , CommandFactory , Parser , Subcommand } ;
4
4
use clap_complete:: { generate, Shell } ;
5
5
use itertools:: Itertools ;
6
6
use kabalist_client:: { Client , Uuid } ;
@@ -313,7 +313,7 @@ impl AccountCommands {
313
313
AccountCommands :: Login { name, password } => {
314
314
let password = password
315
315
. map ( Ok )
316
- . unwrap_or_else ( || rpassword:: read_password_from_tty ( Some ( "password: " ) ) ) ?;
316
+ . unwrap_or_else ( || rpassword:: prompt_password ( "password: " ) ) ?;
317
317
let token = kabalist_client:: login ( & url, & name, & password) . await ?;
318
318
println ! ( "Token: {}" , token. token) ;
319
319
println ! ( "You can export in as LIST_TOKEN or pass it as parameters" ) ;
@@ -323,7 +323,7 @@ impl AccountCommands {
323
323
println ! ( "Recovery for {}" , account_name) ;
324
324
let password = password
325
325
. map ( Ok )
326
- . unwrap_or_else ( || rpassword:: read_password_from_tty ( Some ( "password: " ) ) ) ?;
326
+ . unwrap_or_else ( || rpassword:: prompt_password ( "password: " ) ) ?;
327
327
kabalist_client:: recover_password ( & url, & id, & password) . await ?;
328
328
}
329
329
AccountCommands :: Register {
@@ -333,7 +333,7 @@ impl AccountCommands {
333
333
} => {
334
334
let password = password
335
335
. map ( Ok )
336
- . unwrap_or_else ( || rpassword:: read_password_from_tty ( Some ( "password: " ) ) ) ?;
336
+ . unwrap_or_else ( || rpassword:: prompt_password ( "password: " ) ) ?;
337
337
kabalist_client:: register ( & url, id, & username, & password) . await ?;
338
338
}
339
339
}
@@ -374,7 +374,7 @@ struct Opts {
374
374
#[ tokio:: main]
375
375
async fn main ( ) -> color_eyre:: Result < ( ) > {
376
376
color_eyre:: install ( ) ?;
377
- let args = Opts :: from_args ( ) ;
377
+ let args = Opts :: parse ( ) ;
378
378
379
379
match args. command {
380
380
Commands :: Account ( a) => {
0 commit comments