From 72cb1bd06dfdcec7c707e46fff44b3351a6c5ea9 Mon Sep 17 00:00:00 2001
From: Jane Lusby <jlusby@yaah.dev>
Date: Fri, 7 Jan 2022 10:10:30 -0800
Subject: [PATCH] silence tidy errors

---
 library/std/src/error.rs       | 14 ++++--------
 library/std/src/error/tests.rs | 40 +++++++++++++++++++---------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/library/std/src/error.rs b/library/std/src/error.rs
index 5514876c5d3..613ec43a906 100644
--- a/library/std/src/error.rs
+++ b/library/std/src/error.rs
@@ -1284,9 +1284,7 @@ fn fmt_multiline(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 
             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 {
@@ -1310,8 +1308,7 @@ fn fmt_multiline(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
     }
 }
 
-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
@@ -1353,9 +1350,7 @@ fn fmt_multiline(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 
             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 {
@@ -1411,8 +1406,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 }
 
 #[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) }
     }
diff --git a/library/std/src/error/tests.rs b/library/std/src/error/tests.rs
index 0835e282c46..eae5f43ff3c 100644
--- a/library/std/src/error/tests.rs
+++ b/library/std/src/error/tests.rs
@@ -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);
 }
@@ -112,20 +114,22 @@ 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());
 }
@@ -133,7 +137,8 @@ fn error_with_backtrace_outputs_correctly_with_one_source() {
 #[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:
@@ -141,14 +146,15 @@ fn error_with_backtrace_outputs_correctly_with_two_sources() {
    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());
 }
@@ -313,11 +319,11 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 
 
 Caused by:
-   0: 
-      The message
-      
-   1: 
-      The message
+   0: \
+\n      The message
+      \
+\n   1: \
+\n      The message
       ";
 
     let actual = report.to_string();
@@ -399,11 +405,11 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 
 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);