diff --git a/jaarg-nostd/examples/basic_nostd.rs b/jaarg-nostd/examples/basic_nostd.rs index 0e9c645..d64e71e 100644 --- a/jaarg-nostd/examples/basic_nostd.rs +++ b/jaarg-nostd/examples/basic_nostd.rs @@ -57,7 +57,7 @@ extern "C" fn safe_main(args: &[&str]) -> ExitCode { ) { ParseResult::ContinueSuccess => (), ParseResult::ExitSuccess => { return ExitCode::SUCCESS; } - ParseResult::ExitError => { return ExitCode::FAILURE; } + ParseResult::ExitFailure => { return ExitCode::FAILURE; } } // Print the result variables diff --git a/jaarg/examples/basic.rs b/jaarg/examples/basic.rs index 780fa3b..29ca0d9 100644 --- a/jaarg/examples/basic.rs +++ b/jaarg/examples/basic.rs @@ -40,7 +40,7 @@ fn main() { }) { ParseResult::ContinueSuccess => (), ParseResult::ExitSuccess => std::process::exit(0), - ParseResult::ExitError => std::process::exit(1), + ParseResult::ExitFailure => std::process::exit(1), } // Print the result variables diff --git a/jaarg/examples/bin2h.rs b/jaarg/examples/bin2h.rs index b094358..9decbfe 100644 --- a/jaarg/examples/bin2h.rs +++ b/jaarg/examples/bin2h.rs @@ -234,6 +234,6 @@ pub fn main() -> ExitCode { } }, ParseResult::ExitSuccess => { ExitCode::SUCCESS } - ParseResult::ExitError => { ExitCode::FAILURE } + ParseResult::ExitFailure => { ExitCode::FAILURE } } } diff --git a/jaarg/src/alloc.rs b/jaarg/src/alloc.rs index 784ed39..66b693e 100644 --- a/jaarg/src/alloc.rs +++ b/jaarg/src/alloc.rs @@ -28,7 +28,7 @@ impl Opts<&'static str> { }, error) { ParseResult::ContinueSuccess => ParseMapResult::Map(out), ParseResult::ExitSuccess => ParseMapResult::ExitSuccess, - ParseResult::ExitError => ParseMapResult::ExitFailure, + ParseResult::ExitFailure => ParseMapResult::ExitFailure, } } } diff --git a/jaarg/src/argparse.rs b/jaarg/src/argparse.rs index de6a7ff..87baa79 100644 --- a/jaarg/src/argparse.rs +++ b/jaarg/src/argparse.rs @@ -15,7 +15,7 @@ pub enum ParseResult { /// Parsing succeeded and program should exit with success (eg; `exit(0)`). ExitSuccess, /// There was an error while parsing and program should exit with failure (eg; `exit(1)`). - ExitError, + ExitFailure, } /// Execution control for parser handlers. @@ -131,7 +131,7 @@ impl Opts { Err(err) => { // Call the error handler error(program_name, err); - return ParseResult::ExitError; + return ParseResult::ExitFailure; } } } @@ -139,7 +139,7 @@ impl Opts { // Ensure that value options are provided a value if let Some((name, _)) = state.expects_arg.take() { error(program_name, ParseError::ExpectArgument(name)); - return ParseResult::ExitError; + return ParseResult::ExitFailure; } // Ensure that all required arguments have been provided @@ -148,12 +148,12 @@ impl Opts { match option.r#type { OptType::Positional => if i >= state.positional_index && option.is_required() { error(program_name, ParseError::RequiredPositional(option.first_name())); - return ParseResult::ExitError; + return ParseResult::ExitFailure; } OptType::Flag | OptType::Value => if option.is_required() { if !state.required_param_presences.get(required_flag_idx) { error(program_name, ParseError::RequiredParameter(option.first_name())); - return ParseResult::ExitError; + return ParseResult::ExitFailure; } required_flag_idx += 1; }