Skip to content

Commit

Permalink
silence tidy errors
Browse files Browse the repository at this point in the history
  • Loading branch information
yaahc committed Jan 7, 2022
1 parent 5b3902f commit 72cb1bd
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
14 changes: 4 additions & 10 deletions library/std/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1284,9 +1284,7 @@ where

for (ind, error) in cause.chain().enumerate() {
writeln!(f)?;
let mut indented = Indented {
inner: f,
};
let mut indented = Indented { inner: f };
if multiple {
write!(indented, "{: >4}: {}", ind, error)?;
} else {
Expand All @@ -1310,8 +1308,7 @@ where
}
}

impl Report<Box<dyn Error>>
{
impl Report<Box<dyn Error>> {
fn backtrace(&self) -> Option<&Backtrace> {
// have to grab the backtrace on the first error directly since that error may not be
// 'static
Expand Down Expand Up @@ -1353,9 +1350,7 @@ impl Report<Box<dyn Error>>

for (ind, error) in cause.chain().enumerate() {
writeln!(f)?;
let mut indented = Indented {
inner: f,
};
let mut indented = Indented { inner: f };
if multiple {
write!(indented, "{: >4}: {}", ind, error)?;
} else {
Expand Down Expand Up @@ -1411,8 +1406,7 @@ where
}

#[unstable(feature = "error_reporter", issue = "90172")]
impl fmt::Display for Report<Box<dyn Error>>
{
impl fmt::Display for Report<Box<dyn Error>> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if self.pretty { self.fmt_multiline(f) } else { self.fmt_singleline(f) }
}
Expand Down
40 changes: 23 additions & 17 deletions library/std/src/error/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,13 @@ fn multi_line_formatting() {
let error = SuperError { source: SuperErrorSideKick };
let report = Report::new(&error).pretty(true);
let actual = report.to_string();
let expected = String::from("\
let expected = String::from(
"\
SuperError is here!
Caused by:
SuperErrorSideKick is here!");
SuperErrorSideKick is here!",
);

assert_eq!(expected, actual);
}
Expand All @@ -112,43 +114,47 @@ fn error_with_no_sources_formats_multi_line_correctly() {
#[test]
fn error_with_backtrace_outputs_correctly_with_one_source() {
let trace = Backtrace::force_capture();
let expected = format!("\
let expected = format!(
"\
The source of the error
Caused by:
Error with backtrace
Stack backtrace:
{}", trace);
{}",
trace
);
let error = GenericError::new("Error with backtrace");
let mut error = GenericError::new_with_source("The source of the error", error);
error.backtrace = Some(trace);
let report = Report::new(error).pretty(true).show_backtrace(true);


println!("Error: {}", report);
assert_eq!(expected.trim_end(), report.to_string());
}

#[test]
fn error_with_backtrace_outputs_correctly_with_two_sources() {
let trace = Backtrace::force_capture();
let expected = format!("\
let expected = format!(
"\
Error with two sources
Caused by:
0: The source of the error
1: Error with backtrace
Stack backtrace:
{}", trace);
{}",
trace
);
let mut error = GenericError::new("Error with backtrace");
error.backtrace = Some(trace);
let error = GenericError::new_with_source("The source of the error", error);
let error = GenericError::new_with_source("Error with two sources", error);
let report = Report::new(error).pretty(true).show_backtrace(true);


println!("Error: {}", report);
assert_eq!(expected.trim_end(), report.to_string());
}
Expand Down Expand Up @@ -313,11 +319,11 @@ The message
Caused by:
0:
The message
1:
The message
0: \
\n The message
\
\n 1: \
\n The message
";

let actual = report.to_string();
Expand Down Expand Up @@ -399,11 +405,11 @@ line 2
Caused by:
0: line 1
line 2
\
\n line 2
1: line 1
line 2";
\
\n line 2";

let actual = report.to_string();
assert_eq!(expected, actual);
Expand Down

0 comments on commit 72cb1bd

Please sign in to comment.