@@ -488,32 +488,32 @@ fn do_printf<'a>(
488
488
Ok ( ( ) )
489
489
}
490
490
491
- fn start ( ) -> Result < ( ) , Box < dyn Error > > {
491
+ fn main ( ) -> ExitCode {
492
492
setlocale ( LocaleCategory :: LcAll , "" ) ;
493
- textdomain ( env ! ( "PROJECT_NAME" ) ) ?;
494
- bind_textdomain_codeset ( env ! ( "PROJECT_NAME" ) , "UTF-8" ) ?;
493
+ // TODO
494
+ // unwrap
495
+ textdomain ( env ! ( "PROJECT_NAME" ) ) . unwrap ( ) ;
496
+ // TODO
497
+ // unwrap
498
+ bind_textdomain_codeset ( env ! ( "PROJECT_NAME" ) , "UTF-8" ) . unwrap ( ) ;
495
499
496
500
let args = std:: env:: args_os ( ) . collect :: < Vec < _ > > ( ) ;
497
501
498
- match & args. as_slice ( ) {
499
- & & [ ref _program_file_name, ref format, ref arguments @ ..] => {
502
+ match args. as_slice ( ) {
503
+ & [ ref _program_file_name, ref format, ref arguments @ ..] => {
500
504
let arguments_iterator = arguments. iter ( ) . map ( |os| os. as_bytes ( ) ) ;
501
505
502
- do_printf ( format. as_bytes ( ) , arguments_iterator) ?;
506
+ match do_printf ( format. as_bytes ( ) , arguments_iterator) {
507
+ Ok ( ( ) ) => ExitCode :: SUCCESS ,
508
+ Err ( er) => {
509
+ eprint ! ( "printf: {er}" ) ;
510
+
511
+ ExitCode :: FAILURE
512
+ }
513
+ }
503
514
}
504
515
_ => {
505
- return Err ( Box :: from ( gettext ( "not enough arguments" ) ) ) ;
506
- }
507
- }
508
-
509
- Ok ( ( ) )
510
- }
511
-
512
- fn main ( ) -> ExitCode {
513
- match start ( ) {
514
- Ok ( ( ) ) => ExitCode :: SUCCESS ,
515
- Err ( bo) => {
516
- eprint ! ( "printf: {bo}" ) ;
516
+ eprintln ! ( "printf: {}" , gettext( "not enough arguments" ) ) ;
517
517
518
518
ExitCode :: FAILURE
519
519
}
0 commit comments