Skip to content

Commit f4a96d1

Browse files
Remove helper start function
1 parent 06a1a80 commit f4a96d1

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

display/printf.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -488,32 +488,32 @@ fn do_printf<'a>(
488488
Ok(())
489489
}
490490

491-
fn start() -> Result<(), Box<dyn Error>> {
491+
fn main() -> ExitCode {
492492
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();
495499

496500
let args = std::env::args_os().collect::<Vec<_>>();
497501

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 @ ..] => {
500504
let arguments_iterator = arguments.iter().map(|os| os.as_bytes());
501505

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+
}
503514
}
504515
_ => {
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"));
517517

518518
ExitCode::FAILURE
519519
}

0 commit comments

Comments
 (0)