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

Use generics instead of trait objects in error functions.

Browse Source
This commit is contained in:
jcamiel 2024-01-25 11:29:34 +01:00
parent 404c022074
commit 494ce7fb31
No known key found for this signature in database
GPG Key ID: 07FF11CFD55356CC
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/hurl/src/util/logger.rs
View File

@ -227,7 +227,7 @@ impl Logger {
}
}
pub fn debug_error(&self, content: &str, error: &dyn Error) {
pub fn debug_error<E: Error>(&self, content: &str, error: &E) {
if self.verbosity.is_none() {
return;
}
@ -298,7 +298,7 @@ impl Logger {
}
}
pub fn error_rich(&self, content: &str, error: &dyn Error) {
pub fn error_rich<E: Error>(&self, content: &str, error: &E) {
if self.color {
log_error_rich(&self.filename, content, error)
} else {
@ -412,12 +412,12 @@ fn log_debug_important(message: &str) {
}
}
fn log_debug_error(filename: &str, content: &str, error: &dyn Error) {
fn log_debug_error<E: Error>(filename: &str, content: &str, error: &E) {
let message = error_string(filename, content, error, true);
get_lines(&message).iter().for_each(|l| log_debug(l));
}
fn log_debug_error_no_color(filename: &str, content: &str, error: &dyn Error) {
fn log_debug_error_no_color<E: Error>(filename: &str, content: &str, error: &E) {
let message = error_string(filename, content, error, false);
get_lines(&message)
.iter()
@ -472,12 +472,12 @@ fn log_error_no_color(message: &str) {
eprintln!("error: {message}");
}
fn log_error_rich(filename: &str, content: &str, error: &dyn Error) {
fn log_error_rich<E: Error>(filename: &str, content: &str, error: &E) {
let message = error_string(filename, content, error, true);
eprintln!("{}: {}\n", "error".red().bold(), &message)
}
fn log_error_rich_no_color(filename: &str, content: &str, error: &dyn Error) {
fn log_error_rich_no_color<E: Error>(filename: &str, content: &str, error: &E) {
let message = error_string(filename, content, error, false);
eprintln!("error: {}\n", &message)
}
@ -550,10 +550,10 @@ fn log_test_completed_no_color(result: &HurlResult, filename: &str) {
}
/// Returns an `error` as a string, given `lines` of content and a `filename`.
pub(crate) fn error_string(
pub(crate) fn error_string<E: Error>(
filename: &str,
content: &str,
error: &dyn Error,
error: &E,
colored: bool,
) -> String {
let lines = get_lines(content);