Orange-OpenSource/hurl
1
1
Fork 0
mirror of https://github.com/Orange-OpenSource/hurl.git synced 2024-12-26 04:23:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't print error when hurl display help because of no inputs.

Browse Source
This commit is contained in:
jcamiel 2022-09-12 09:09:28 +02:00
parent c1684f60b3
commit 61ab7674b1
No known key found for this signature in database
GPG Key ID: 07FF11CFD55356CC
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/hurl/src/main.rs
View File

@ -226,16 +226,17 @@ fn execute(
fn unwrap_or_exit<T>(result: Result<T, CliError>, code: i32, logger: &BaseLogger) -> T { fn unwrap_or_exit<T>(result: Result<T, CliError>, code: i32, logger: &BaseLogger) -> T {
match result { match result {
Ok(v) => v, Ok(v) => v,
Err(e) => exit(&e.message, code, logger), Err(e) => exit_with_error(&e.message, code, logger),
} }
} }
/// Prints an error message and exits the current process with an exit code. /// Prints an error message and exits the current process with an exit code.
fn exit(message: &str, code: i32, logger: &BaseLogger) -> ! { fn exit_with_error(message: &str, code: i32, logger: &BaseLogger) -> ! {
if !message.is_empty() {
logger.error(message); logger.error(message);
}
std::process::exit(code); std::process::exit(code);
} }
/// Executes Hurl entry point. /// Executes Hurl entry point.
fn main() { fn main() {
let version_info = format!( let version_info = format!(
@ -271,7 +272,7 @@ fn main() {
} else { } else {
"" ""
}; };
exit(error, EXIT_ERROR_COMMANDLINE, &base_logger); exit_with_error(error, EXIT_ERROR_COMMANDLINE, &base_logger);
} else if filenames.is_empty() { } else if filenames.is_empty() {
filenames.push("-".to_string()); filenames.push("-".to_string());
} }
@ -279,7 +280,7 @@ fn main() {
let current_dir = match std::env::current_dir() { let current_dir = match std::env::current_dir() {
Ok(c) => c, Ok(c) => c,
Err(error) => { Err(error) => {
exit( exit_with_error(
error.to_string().as_str(), error.to_string().as_str(),
EXIT_ERROR_UNDEFINED, EXIT_ERROR_UNDEFINED,
&base_logger, &base_logger,
@ -306,7 +307,7 @@ fn main() {
"hurl: cannot access '{}': No such file or directory", "hurl: cannot access '{}': No such file or directory",
filename filename
); );
exit(&message, EXIT_ERROR_PARSING, &base_logger); exit_with_error(&message, EXIT_ERROR_PARSING, &base_logger);
} }
let content = cli::read_to_string(filename); let content = cli::read_to_string(filename);
let content = unwrap_or_exit(content, EXIT_ERROR_PARSING, &base_logger); let content = unwrap_or_exit(content, EXIT_ERROR_PARSING, &base_logger);
@ -368,7 +369,7 @@ fn main() {
assert: false, assert: false,
}; };
let message = error.fixme(); let message = error.fixme();
exit(&message, EXIT_ERROR_RUNTIME, &base_logger); exit_with_error(&message, EXIT_ERROR_RUNTIME, &base_logger);
} }
} }
} else { } else {