strips/jaarg
2
0
Fork 0
mirror of https://github.com/gay-pizza/jaarg.git synced 2025-12-19 07:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normalise naming between ParseResult and ParseMapResult

Browse Source
This commit is contained in:
a dinosaur
2025-11-17 16:35:07 +11:00
parent 87e3e5f4e0
commit a6abeff9f2
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jaarg-nostd/examples/basic_nostd.rs
View File

@@ -57,7 +57,7 @@ extern "C" fn safe_main(args: &[&str]) -> ExitCode {
) { ) {
ParseResult::ContinueSuccess => (), ParseResult::ContinueSuccess => (),
ParseResult::ExitSuccess => { return ExitCode::SUCCESS; } ParseResult::ExitSuccess => { return ExitCode::SUCCESS; }
ParseResult::ExitError => { return ExitCode::FAILURE; } ParseResult::ExitFailure => { return ExitCode::FAILURE; }
} }
// Print the result variables // Print the result variables

2
jaarg/examples/basic.rs
View File

@@ -40,7 +40,7 @@ fn main() {
}) { }) {
ParseResult::ContinueSuccess => (), ParseResult::ContinueSuccess => (),
ParseResult::ExitSuccess => std::process::exit(0), ParseResult::ExitSuccess => std::process::exit(0),
ParseResult::ExitError => std::process::exit(1), ParseResult::ExitFailure => std::process::exit(1),
} }
// Print the result variables // Print the result variables

2
jaarg/examples/bin2h.rs
View File

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

2
jaarg/src/alloc.rs
View File

@@ -28,7 +28,7 @@ impl Opts<&'static str> {
}, error) { }, error) {
ParseResult::ContinueSuccess => ParseMapResult::Map(out), ParseResult::ContinueSuccess => ParseMapResult::Map(out),
ParseResult::ExitSuccess => ParseMapResult::ExitSuccess, ParseResult::ExitSuccess => ParseMapResult::ExitSuccess,
ParseResult::ExitError => ParseMapResult::ExitFailure, ParseResult::ExitFailure => ParseMapResult::ExitFailure,
} }
} }
} }

10
jaarg/src/argparse.rs
View File

@@ -15,7 +15,7 @@ pub enum ParseResult {
/// Parsing succeeded and program should exit with success (eg; `exit(0)`). /// Parsing succeeded and program should exit with success (eg; `exit(0)`).
ExitSuccess, ExitSuccess,
/// There was an error while parsing and program should exit with failure (eg; `exit(1)`). /// There was an error while parsing and program should exit with failure (eg; `exit(1)`).
ExitError, ExitFailure,
} }
/// Execution control for parser handlers. /// Execution control for parser handlers.
@@ -131,7 +131,7 @@ impl<ID: 'static> Opts<ID> {
Err(err) => { Err(err) => {
// Call the error handler // Call the error handler
error(program_name, err); 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 // Ensure that value options are provided a value
if let Some((name, _)) = state.expects_arg.take() { if let Some((name, _)) = state.expects_arg.take() {
error(program_name, ParseError::ExpectArgument(name)); error(program_name, ParseError::ExpectArgument(name));
return ParseResult::ExitError; return ParseResult::ExitFailure;
} }
// Ensure that all required arguments have been provided // Ensure that all required arguments have been provided
@@ -148,12 +148,12 @@ impl<ID: 'static> Opts<ID> {
match option.r#type { match option.r#type {
OptType::Positional => if i >= state.positional_index && option.is_required() { OptType::Positional => if i >= state.positional_index && option.is_required() {
error(program_name, ParseError::RequiredPositional(option.first_name())); error(program_name, ParseError::RequiredPositional(option.first_name()));
return ParseResult::ExitError; return ParseResult::ExitFailure;
} }
OptType::Flag | OptType::Value => if option.is_required() { OptType::Flag | OptType::Value => if option.is_required() {
if !state.required_param_presences.get(required_flag_idx) { if !state.required_param_presences.get(required_flag_idx) {
error(program_name, ParseError::RequiredParameter(option.first_name())); error(program_name, ParseError::RequiredParameter(option.first_name()));
return ParseResult::ExitError; return ParseResult::ExitFailure;
} }
required_flag_idx += 1; required_flag_idx += 1;
} }