Rollup merge of #68357 - ollie27:rustdoc_test_errors, r=GuillaumeGomez

[rust.git] / src / librustdoc / externalfiles.rs

diff --git a/src/librustdoc/externalfiles.rs b/src/librustdoc/externalfiles.rs
index 7945850ef08ac84cc69b5da597218893b52ff9dc..8b5a3a2ba61313cd209faf6862537882358d1bc2 100644 (file)
--- a/src/librustdoc/externalfiles.rs
+++ b/src/librustdoc/externalfiles.rs
@@ -1,10 +1,9 @@
+use crate::html::markdown::{ErrorCodes, IdMap, Markdown, Playground};
+use crate::rustc_span::edition::Edition;
+use rustc_feature::UnstableFeatures;
 use std::fs;
 use std::path::Path;
 use std::str;
-use errors;
-use rustc_feature::UnstableFeatures;
-use crate::syntax::edition::Edition;
-use crate::html::markdown::{IdMap, ErrorCodes, Markdown, Playground};
 
 #[derive(Clone, Debug)]
 pub struct ExternalHtml {
@@ -16,29 +15,38 @@ pub struct ExternalHtml {
     pub before_content: String,
     /// Content that will be included inline between the content and </body> of
     /// a rendered Markdown file or generated documentation
-    pub after_content: String
+    pub after_content: String,
 }
 
 impl ExternalHtml {
-    pub fn load(in_header: &[String], before_content: &[String], after_content: &[String],
-                md_before_content: &[String], md_after_content: &[String], diag: &errors::Handler,
-                id_map: &mut IdMap, edition: Edition, playground: &Option<Playground>)
-            -> Option<ExternalHtml> {
+    pub fn load(
+        in_header: &[String],
+        before_content: &[String],
+        after_content: &[String],
+        md_before_content: &[String],
+        md_after_content: &[String],
+        diag: &rustc_errors::Handler,
+        id_map: &mut IdMap,
+        edition: Edition,
+        playground: &Option<Playground>,
+    ) -> Option<ExternalHtml> {
         let codes = ErrorCodes::from(UnstableFeatures::from_environment().is_nightly_build());
         let ih = load_external_files(in_header, diag)?;
         let bc = load_external_files(before_content, diag)?;
         let m_bc = load_external_files(md_before_content, diag)?;
-        let bc = format!("{}{}", bc, Markdown(&m_bc, &[], id_map,
-                                    codes, edition, playground).to_string());
+        let bc = format!(
+            "{}{}",
+            bc,
+            Markdown(&m_bc, &[], id_map, codes, edition, playground).to_string()
+        );
         let ac = load_external_files(after_content, diag)?;
         let m_ac = load_external_files(md_after_content, diag)?;
-        let ac = format!("{}{}", ac, Markdown(&m_ac, &[], id_map,
-                                    codes, edition, playground).to_string());
-        Some(ExternalHtml {
-            in_header: ih,
-            before_content: bc,
-            after_content: ac,
-        })
+        let ac = format!(
+            "{}{}",
+            ac,
+            Markdown(&m_ac, &[], id_map, codes, edition, playground).to_string()
+        );
+        Some(ExternalHtml { in_header: ih, before_content: bc, after_content: ac })
     }
 }
 
@@ -47,9 +55,10 @@ pub enum LoadStringError {
     BadUtf8,
 }
 
-pub fn load_string<P: AsRef<Path>>(file_path: P, diag: &errors::Handler)
-    -> Result<String, LoadStringError>
-{
+pub fn load_string<P: AsRef<Path>>(
+    file_path: P,
+    diag: &rustc_errors::Handler,
+) -> Result<String, LoadStringError> {
     let file_path = file_path.as_ref();
     let contents = match fs::read(file_path) {
         Ok(bytes) => bytes,
@@ -67,7 +76,7 @@ pub fn load_string<P: AsRef<Path>>(file_path: P, diag: &errors::Handler)
     }
 }
 
-fn load_external_files(names: &[String], diag: &errors::Handler) -> Option<String> {
+fn load_external_files(names: &[String], diag: &rustc_errors::Handler) -> Option<String> {
     let mut out = String::new();
     for name in names {
         let s = match load_string(name, diag) {