Enforce merged imports (#290)

Closes #281

docs/src/bin/build_nav.rs

@@ -1,14 +1,10 @@
-use comrak::nodes::AstNode;
+use comrak::{self, nodes::AstNode, Arena};
-use comrak::{self, Arena};
+use docs::{
-use docs::page::{Page, COMRAK_OPTIONS};
+    page::{Page, COMRAK_OPTIONS},
-use docs::string_writer::StringWriter;
+    string_writer::StringWriter,
+};
 use serde_json;
-use std::env;
+use std::{env, error::Error, fs, io, path::Path, str};
-use std::error::Error;
-use std::fs;
-use std::io;
-use std::path::Path;
-use std::str;
 
 fn main() -> Result<(), Box<dyn Error>> {
     let args = env::args().collect::<Vec<_>>();

docs/src/bin/build_page.rs

@@ -1,19 +1,28 @@
-use comrak::nodes::{AstNode, NodeCodeBlock, NodeHeading, NodeHtmlBlock, NodeLink, NodeValue};
+use comrak::{
-use comrak::{self, Arena};
+    self,
-use docs::page::{Page, COMRAK_OPTIONS};
+    nodes::{AstNode, NodeCodeBlock, NodeHeading, NodeHtmlBlock, NodeLink, NodeValue},
-use docs::views;
+    Arena,
+};
+use docs::{
+    page::{Page, COMRAK_OPTIONS},
+    views,
+};
 use serde_json;
-use std::env;
+use std::{
-use std::error::Error;
+    env,
-use std::fs::{self, File};
+    error::Error,
-use std::io::BufReader;
+    fs::{self, File},
-use std::mem;
+    io::BufReader,
-use std::path::Path;
+    mem,
-use std::str::{self, Utf8Error};
+    path::Path,
-use std::string::FromUtf8Error;
+    str::{self, Utf8Error},
-use syntect::highlighting::{Color, ThemeSet};
+    string::FromUtf8Error,
-use syntect::html::highlighted_html_for_string;
+};
-use syntect::parsing::SyntaxSet;
+use syntect::{
+    highlighting::{Color, ThemeSet},
+    html::highlighted_html_for_string,
+    parsing::SyntaxSet,
+};
 
 fn main() -> Result<(), Box<dyn Error>> {
     let args = env::args().collect::<Vec<_>>();

docs/src/page.rs

@@ -1,9 +1,8 @@
-use comrak::nodes::{AstNode, NodeHeading, NodeValue};
+use comrak::{
-use comrak::{Arena, ComrakOptions};
+    nodes::{AstNode, NodeHeading, NodeValue},
-use std::fs;
+    Arena, ComrakOptions,
-use std::io;
+};
-use std::lazy::SyncLazy;
+use std::{fs, io, lazy::SyncLazy, path::Path};
-use std::path::Path;
 
 pub struct Page<'a> {
     pub title: Option<&'a AstNode<'a>>,

docs/src/string_writer.rs

@@ -1,5 +1,4 @@
-use std::io;
+use std::{io, str};
-use std::str;
 
 pub struct StringWriter<'a>(pub &'a mut String);
 

docs/src/views.rs

@@ -2,8 +2,10 @@ use comrak::nodes::AstNode;
 use maud::{html, Markup, PreEscaped, Render, DOCTYPE};
 use std::str;
 
-use crate::page::{Page, COMRAK_OPTIONS};
+use crate::{
-use crate::string_writer::StringWriter;
+    page::{Page, COMRAK_OPTIONS},
+    string_writer::StringWriter,
+};
 
 struct Comrak<'a>(&'a AstNode<'a>);
 

maud/src/lib.rs

@@ -176,12 +176,13 @@ mod iron_support {
     extern crate std;
 
     use crate::PreEscaped;
-    use alloc::boxed::Box;
+    use alloc::{boxed::Box, string::String};
-    use alloc::string::String;
+    use iron::{
-    use iron::headers::ContentType;
+        headers::ContentType,
-    use iron::modifier::{Modifier, Set};
+        modifier::{Modifier, Set},
-    use iron::modifiers::Header;
+        modifiers::Header,
-    use iron::response::{Response, WriteBody};
+        response::{Response, WriteBody},
+    };
     use std::io;
 
     impl Modifier<Response> for PreEscaped<String> {
@@ -205,9 +206,11 @@ mod rocket_support {
 
     use crate::PreEscaped;
     use alloc::string::String;
-    use rocket::http::{ContentType, Status};
+    use rocket::{
-    use rocket::request::Request;
+        http::{ContentType, Status},
-    use rocket::response::{Responder, Response};
+        request::Request,
+        response::{Responder, Response},
+    };
     use std::io::Cursor;
 
     impl Responder<'static> for PreEscaped<String> {

rustfmt.toml

@@ -0,0 +1 @@
+imports_granularity = "Crate"