Tidy up some imports

9 files changed, 24 insertions, 25 deletions

diff --git a/src/archive.rs b/src/archive.rs
index 940d4b6..46ee6d1 100644
--- a/src/archive.rs
+++ b/src/archive.rs
@@ -1,10 +1,10 @@
+use std::fs::File;
+use std::io::{Cursor, Read, Write};
+use std::path::{Path, PathBuf};
+
 use actix_web::http::header::ContentEncoding;
 use libflate::gzip::Encoder;
 use serde::Deserialize;
-use std::fs::File;
-use std::io::{Cursor, Read, Write};
-use std::path::Path;
-use std::path::PathBuf;
 use strum_macros::{Display, EnumIter, EnumString};
 use tar::Builder;
 use zip::{write, ZipWriter};
diff --git a/src/args.rs b/src/args.rs
index 8757bc8..c14f954 100644
--- a/src/args.rs
+++ b/src/args.rs
@@ -1,8 +1,9 @@
+use std::net::IpAddr;
+use std::path::PathBuf;
+
 use clap::{Parser, ValueHint};
 use clap_complete::Shell;
 use http::header::{HeaderMap, HeaderName, HeaderValue};
-use std::net::IpAddr;
-use std::path::PathBuf;
 
 use crate::auth;
 use crate::errors::ContextualError;
diff --git a/src/auth.rs b/src/auth.rs
index 398fdda..c7d0b78 100644
--- a/src/auth.rs
+++ b/src/auth.rs
@@ -1,5 +1,4 @@
-use actix_web::dev::ServiceRequest;
-use actix_web::HttpMessage;
+use actix_web::{dev::ServiceRequest, HttpMessage};
 use actix_web_httpauth::extractors::basic::BasicAuth;
 use sha2::{Digest, Sha256, Sha512};
 
diff --git a/src/errors.rs b/src/errors.rs
index 06569d3..e502634 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -1,4 +1,3 @@
-use crate::{renderer::render_error, MiniserveConfig};
 use actix_web::{
     body::{BoxBody, MessageBody},
     dev::{ResponseHead, Service, ServiceRequest, ServiceResponse},
@@ -8,6 +7,8 @@ use actix_web::{
 use futures::prelude::*;
 use thiserror::Error;
 
+use crate::{renderer::render_error, MiniserveConfig};
+
 #[derive(Debug, Error)]
 pub enum ContextualError {
     /// Any kind of IO errors
diff --git a/src/file_upload.rs b/src/file_upload.rs
index cf214b8..2275c73 100644
--- a/src/file_upload.rs
+++ b/src/file_upload.rs
@@ -1,12 +1,13 @@
-use actix_web::{http::header, HttpRequest, HttpResponse};
-use futures::TryStreamExt;
 use std::{
     io::Write,
     path::{Component, Path, PathBuf},
 };
 
+use actix_web::{http::header, HttpRequest, HttpResponse};
+use futures::TryStreamExt;
+
 use crate::errors::ContextualError;
-use crate::listing::{self};
+use crate::listing;
 
 /// Saves file data from a multipart form field (`field`) to `file_path`, optionally overwriting
 /// existing file.
diff --git a/src/listing.rs b/src/listing.rs
index fbee8de..e40d73a 100644
--- a/src/listing.rs
+++ b/src/listing.rs
@@ -3,9 +3,7 @@ use std::io;
 use std::path::{Component, Path, PathBuf};
 use std::time::SystemTime;
 
-use actix_web::dev::ServiceResponse;
-use actix_web::web::Query;
-use actix_web::{HttpMessage, HttpRequest, HttpResponse};
+use actix_web::{dev::ServiceResponse, web::Query, HttpMessage, HttpRequest, HttpResponse};
 use bytesize::ByteSize;
 use comrak::{markdown_to_html, ComrakOptions};
 use percent_encoding::{percent_decode_str, utf8_percent_encode};
diff --git a/src/main.rs b/src/main.rs
index b49089b..2191599 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,13 +1,12 @@
-use std::io;
-use std::io::Write;
+use std::io::{self, Write};
 use std::net::{IpAddr, SocketAddr, TcpListener};
 use std::thread;
 use std::time::Duration;
 
 use actix_files::NamedFile;
-use actix_web::web;
-use actix_web::{http::header::ContentType, Responder};
-use actix_web::{middleware, App, HttpRequest, HttpResponse};
+use actix_web::{
+    http::header::ContentType, middleware, web, App, HttpRequest, HttpResponse, Responder,
+};
 use actix_web_httpauth::middleware::HttpAuthentication;
 use anyhow::Result;
 use clap::{crate_version, IntoApp, Parser};
diff --git a/src/pipe.rs b/src/pipe.rs
index 6bf32c2..51f094a 100644
--- a/src/pipe.rs
+++ b/src/pipe.rs
@@ -1,9 +1,10 @@
 //! Define an adapter to implement `std::io::Write` on `Sender<Bytes>`.
+use std::io::{self, Error, ErrorKind, Write};
+
 use actix_web::web::{Bytes, BytesMut};
 use futures::channel::mpsc::Sender;
 use futures::executor::block_on;
 use futures::sink::SinkExt;
-use std::io::{self, Error, ErrorKind, Write};
 
 /// Adapter to implement the `std::io::Write` trait on a `Sender<Bytes>` from a futures channel.
 ///
diff --git a/src/renderer.rs b/src/renderer.rs
index 6aad5bd..abffa30 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -1,12 +1,11 @@
+use std::time::SystemTime;
+
 use actix_web::http::StatusCode;
 use chrono::{DateTime, Utc};
 use chrono_humanize::Humanize;
 use clap::{crate_name, crate_version};
-use fast_qr::convert::svg::SvgBuilder;
-use fast_qr::qr::QRCodeError;
-use fast_qr::QRBuilder;
+use fast_qr::{convert::svg::SvgBuilder, qr::QRCodeError, QRBuilder};
 use maud::{html, Markup, PreEscaped, DOCTYPE};
-use std::time::SystemTime;
 use strum::IntoEnumIterator;
 
 use crate::auth::CurrentUser;