Auto merge of #69627 - ehuss:update-cargo-clippy, r=Dylan-DPC

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

diff --git a/src/librustdoc/docfs.rs b/src/librustdoc/docfs.rs
index 740947fc3e37e8d1f20700d21d8bb6b24dfb1127..ecc394a2bc992082dc558992658a7fa080023bf1 100644 (file)
--- a/src/librustdoc/docfs.rs
+++ b/src/librustdoc/docfs.rs
@@ -9,13 +9,11 @@
 //! needs to read-after-write from a file, then it would be added to this
 //! abstraction.
 
-use errors;
-
 use std::fs;
 use std::io;
 use std::path::Path;
-use std::sync::Arc;
 use std::sync::mpsc::{channel, Receiver, Sender};
+use std::sync::Arc;
 
 macro_rules! try_err {
     ($e:expr, $file:expr) => {{
@@ -38,14 +36,11 @@ pub struct ErrorStorage {
 impl ErrorStorage {
     pub fn new() -> ErrorStorage {
         let (sender, receiver) = channel();
-        ErrorStorage {
-            sender: Some(sender),
-            receiver,
-        }
+        ErrorStorage { sender: Some(sender), receiver }
     }
 
     /// Prints all stored errors. Returns the number of printed errors.
-    pub fn write_errors(&mut self, diag: &errors::Handler) -> usize {
+    pub fn write_errors(&mut self, diag: &rustc_errors::Handler) -> usize {
         let mut printed = 0;
         // In order to drop the sender part of the channel.
         self.sender = None;
@@ -67,10 +62,7 @@ pub struct DocFS {
 
 impl DocFS {
     pub fn new(errors: &Arc<ErrorStorage>) -> DocFS {
-        DocFS {
-            sync_only: false,
-            errors: Arc::clone(errors),
-        }
+        DocFS { sync_only: false, errors: Arc::clone(errors) }
     }
 
     pub fn set_sync_only(&mut self, sync_only: bool) {
@@ -96,16 +88,16 @@ pub fn write<P, C, E>(&self, path: P, contents: C) -> Result<(), E>
             let contents = contents.as_ref().to_vec();
             let path = path.as_ref().to_path_buf();
             let sender = self.errors.sender.clone().unwrap();
-            rayon::spawn(move || {
-                match fs::write(&path, &contents) {
-                    Ok(_) => {
-                        sender.send(None)
-                            .expect(&format!("failed to send error on \"{}\"", path.display()));
-                    }
-                    Err(e) => {
-                        sender.send(Some(format!("\"{}\": {}", path.display(), e)))
-                            .expect(&format!("failed to send non-error on \"{}\"", path.display()));
-                    }
+            rayon::spawn(move || match fs::write(&path, &contents) {
+                Ok(_) => {
+                    sender
+                        .send(None)
+                        .expect(&format!("failed to send error on \"{}\"", path.display()));
+                }
+                Err(e) => {
+                    sender
+                        .send(Some(format!("\"{}\": {}", path.display(), e)))
+                        .expect(&format!("failed to send non-error on \"{}\"", path.display()));
                 }
             });
             Ok(())