Rustfmt for 2024

Author: ehuss

examples/remove-emphasis/mdbook-remove-emphasis/src/main.rs

@@ -1,10 +1,10 @@
 //! This is a demonstration of an mdBook preprocessor which parses markdown
 //! and removes any instances of emphasis.
 
+use mdbook::BookItem;
 use mdbook::book::{Book, Chapter};
 use mdbook::errors::Error;
 use mdbook::preprocess::{CmdPreprocessor, Preprocessor, PreprocessorContext};
-use mdbook::BookItem;
 use pulldown_cmark::{Event, Parser, Tag, TagEnd};
 use std::io;
 

src/book/book.rs

@@ -4,7 +4,7 @@ use std::fs::{self, File};
 use std::io::{Read, Write};
 use std::path::{Path, PathBuf};
 
-use super::summary::{parse_summary, Link, SectionNumber, Summary, SummaryItem};
+use super::summary::{Link, SectionNumber, Summary, SummaryItem, parse_summary};
 use crate::config::BuildConfig;
 use crate::errors::*;
 use crate::utils::bracket_escape;

src/book/mod.rs

@@ -9,9 +9,9 @@ mod book;
 mod init;
 mod summary;
 
-pub use self::book::{load_book, Book, BookItem, BookItems, Chapter};
+pub use self::book::{Book, BookItem, BookItems, Chapter, load_book};
 pub use self::init::BookBuilder;
-pub use self::summary::{parse_summary, Link, SectionNumber, Summary, SummaryItem};
+pub use self::summary::{Link, SectionNumber, Summary, SummaryItem, parse_summary};
 
 use log::{debug, error, info, log_enabled, trace, warn};
 use std::ffi::OsString;
@@ -817,9 +817,11 @@ mod tests {
 
         let preprocessors = determine_preprocessors(&cfg).unwrap();
 
-        assert!(!preprocessors
-            .iter()
-            .any(|preprocessor| preprocessor.name() == "random"));
+        assert!(
+            !preprocessors
+                .iter()
+                .any(|preprocessor| preprocessor.name() == "random")
+        );
     }
 
     #[test]
@@ -836,9 +838,11 @@ mod tests {
 
         let preprocessors = determine_preprocessors(&cfg).unwrap();
 
-        assert!(!preprocessors
-            .iter()
-            .any(|preprocessor| preprocessor.name() == "links"));
+        assert!(
+            !preprocessors
+                .iter()
+                .any(|preprocessor| preprocessor.name() == "links")
+        );
     }
 
     #[test]

src/book/summary.rs

@@ -776,7 +776,10 @@ mod tests {
 
         assert!(got.is_err());
         let error_message = got.err().unwrap().to_string();
-        assert_eq!(error_message, "failed to parse SUMMARY.md line 2, column 1: Suffix chapters cannot be followed by a list");
+        assert_eq!(
+            error_message,
+            "failed to parse SUMMARY.md line 2, column 1: Suffix chapters cannot be followed by a list"
+        );
     }
 
     #[test]
@@ -788,7 +791,10 @@ mod tests {
 
         assert!(got.is_err());
         let error_message = got.err().unwrap().to_string();
-        assert_eq!(error_message, "failed to parse SUMMARY.md line 1, column 0: Suffix chapters cannot be followed by a list");
+        assert_eq!(
+            error_message,
+            "failed to parse SUMMARY.md line 1, column 0: Suffix chapters cannot be followed by a list"
+        );
     }
 
     #[test]

src/cmd/build.rs

@@ -1,7 +1,7 @@
 use super::command_prelude::*;
 use crate::{get_book_dir, open};
-use mdbook::errors::Result;
 use mdbook::MDBook;
+use mdbook::errors::Result;
 use std::path::PathBuf;
 
 // Create clap subcommand arguments

src/cmd/command_prelude.rs

@@ -1,6 +1,6 @@
 //! Helpers for building the command-line arguments for commands.
 
-pub use clap::{arg, Arg, ArgMatches, Command};
+pub use clap::{Arg, ArgMatches, Command, arg};
 use std::path::PathBuf;
 
 pub trait CommandExt: Sized {

src/cmd/init.rs

@@ -1,8 +1,8 @@
 use crate::get_book_dir;
-use clap::{arg, ArgMatches, Command as ClapCommand};
+use clap::{ArgMatches, Command as ClapCommand, arg};
+use mdbook::MDBook;
 use mdbook::config;
 use mdbook::errors::Result;
-use mdbook::MDBook;
 use std::io;
 use std::io::Write;
 use std::process::Command;

src/cmd/serve.rs

@@ -2,15 +2,15 @@ use super::command_prelude::*;
 #[cfg(feature = "watch")]
 use super::watch;
 use crate::{get_book_dir, open};
+use axum::Router;
 use axum::extract::ws::{Message, WebSocket, WebSocketUpgrade};
 use axum::routing::get;
-use axum::Router;
 use clap::builder::NonEmptyStringValueParser;
-use futures_util::sink::SinkExt;
 use futures_util::StreamExt;
+use futures_util::sink::SinkExt;
+use mdbook::MDBook;
 use mdbook::errors::*;
 use mdbook::utils::fs::get_404_output_file;
-use mdbook::MDBook;
 use std::net::{SocketAddr, ToSocketAddrs};
 use std::path::PathBuf;
 use tokio::sync::broadcast;

src/cmd/test.rs

@@ -1,9 +1,9 @@
 use super::command_prelude::*;
 use crate::get_book_dir;
-use clap::builder::NonEmptyStringValueParser;
 use clap::ArgAction;
-use mdbook::errors::Result;
+use clap::builder::NonEmptyStringValueParser;
 use mdbook::MDBook;
+use mdbook::errors::Result;
 use std::path::PathBuf;
 
 // Create clap subcommand arguments

src/cmd/watch.rs

@@ -1,7 +1,7 @@
 use super::command_prelude::*;
 use crate::{get_book_dir, open};
-use mdbook::errors::Result;
 use mdbook::MDBook;
+use mdbook::errors::Result;
 use std::path::{Path, PathBuf};
 
 mod native;