matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Merge pull request #620 from matthiasbeyer/libimagerror/replace-unwraps 

Libimagerror/replace unwraps
This commit is contained in:
Matthias Beyer 2016-08-05 13:19:18 +02:00 committed by GitHub
parent b6ce57418e 11dc277c6b
commit dd7d7b45ef
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libimagerror/src/trace.rs
View File

@ -62,10 +62,12 @@ pub fn trace_error_dbg(e: &Error) {
/// processed. /// processed.
fn print_trace_maxdepth(idx: u64, e: &Error, max: u64) -> Option<&Error> { fn print_trace_maxdepth(idx: u64, e: &Error, max: u64) -> Option<&Error> {
if e.cause().is_some() && idx > 0 { if e.cause().is_some() && idx > 0 {
match print_trace_maxdepth(idx - 1, e.cause().unwrap(), max) { e.cause().map(|cause| {
match print_trace_maxdepth(idx - 1, cause, max) {
None => write!(stderr(), "\n").ok(), None => write!(stderr(), "\n").ok(),
Some(_) => write!(stderr(), " -- caused:\n").ok(), Some(_) => write!(stderr(), " -- caused:\n").ok(),
}; };
});
} else { } else {
write!(stderr(), "\n").ok(); write!(stderr(), "\n").ok();
} }
@ -75,13 +77,13 @@ fn print_trace_maxdepth(idx: u64, e: &Error, max: u64) -> Option<&Error> {
/// Count errors in `Error::cause()` recursively /// Count errors in `Error::cause()` recursively
fn count_error_causes(e: &Error) -> u64 { fn count_error_causes(e: &Error) -> u64 {
1 + if e.cause().is_some() { count_error_causes(e.cause().unwrap()) } else { 0 } 1 + e.cause().map(|c| count_error_causes(c)).unwrap_or(0)
} }
fn print_trace_dbg(idx: u64, e: &Error) { fn print_trace_dbg(idx: u64, e: &Error) {
debug!("{}: {}", Red.blink().paint(format!("ERROR[{:>4}]", idx)), e.description()); debug!("{}: {}", Red.blink().paint(format!("ERROR[{:>4}]", idx)), e.description());
if e.cause().is_some() { if e.cause().is_some() {
print_trace_dbg(idx + 1, e.cause().unwrap()); e.cause().map(|c| print_trace_dbg(idx + 1, c));
} }
} }