Normalise naming between ParseResult and ParseMapResult

This commit is contained in:
2025-11-17 16:35:07 +11:00
parent 87e3e5f4e0
commit a6abeff9f2
5 changed files with 9 additions and 9 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -234,6 +234,6 @@ pub fn main() -> ExitCode {
}
},
ParseResult::ExitSuccess => { ExitCode::SUCCESS }
ParseResult::ExitError => { ExitCode::FAILURE }
ParseResult::ExitFailure => { ExitCode::FAILURE }
}
}

View File

@@ -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,
}
}
}

View File

@@ -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<ID: 'static> Opts<ID> {
Err(err) => {
// Call the error handler
error(program_name, err);
return ParseResult::ExitError;
return ParseResult::ExitFailure;
}
}
}
@@ -139,7 +139,7 @@ impl<ID: 'static> Opts<ID> {
// 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<ID: 'static> Opts<ID> {
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;
}