Reformat uses

src/main.rs

@@ -6,14 +6,15 @@ extern crate serde;
 #[cfg_attr(not(feature = "dev"), macro_use)]
 extern crate diesel_migrations;
 
-#[cfg(feature = "dev")]
-use crate::setup::Config;
-
 use actix_web::{web, App, FromRequest, HttpServer};
-use diesel::r2d2::{self, ConnectionManager};
-use diesel::sqlite::SqliteConnection;
+use diesel::{
+    r2d2::{self, ConnectionManager},
+    sqlite::SqliteConnection,
+};
 use std::process;
 
+#[cfg(feature = "dev")]
+use crate::setup::Config;
 #[cfg(feature = "dev")]
 use dotenv;
 #[cfg(not(feature = "dev"))]

src/queries.rs

@@ -78,15 +78,14 @@ macro_rules! delete {
 
 /// Queries affecting the `files` table
 pub mod files {
-    use crate::models::files::*;
-    use crate::queries::SelectFilters;
-    use crate::schema::files::dsl::*;
-    use crate::schema::files::table;
-    use crate::Pool;
-
+    use crate::{
+        models::files::*,
+        queries::SelectFilters,
+        schema::files::{dsl::*, table},
+        Pool,
+    };
     use actix_web::web::Data;
-    use diesel::prelude::*;
-    use diesel::result::QueryResult;
+    use diesel::{prelude::*, result::QueryResult};
 
     /// SELECT multiple file entries
     pub fn select(filters: SelectFilters, pool: Data<Pool>) -> QueryResult<Vec<File>> {
@@ -117,15 +116,14 @@ pub mod files {
 
 /// Queries affecting the `links` table
 pub mod links {
-    use crate::models::links::*;
-    use crate::queries::SelectFilters;
-    use crate::schema::links::dsl::*;
-    use crate::schema::links::table;
-    use crate::Pool;
-
+    use crate::{
+        models::links::*,
+        queries::SelectFilters,
+        schema::links::{dsl::*, table},
+        Pool,
+    };
     use actix_web::web::Data;
-    use diesel::prelude::*;
-    use diesel::result::QueryResult;
+    use diesel::{prelude::*, result::QueryResult};
 
     /// SELECT multiple link entries
     pub fn select(filters: SelectFilters, pool: Data<Pool>) -> QueryResult<Vec<Link>> {
@@ -156,15 +154,14 @@ pub mod links {
 
 /// Queries affecting the `texts` table
 pub mod texts {
-    use crate::models::texts::*;
-    use crate::queries::SelectFilters;
-    use crate::schema::texts::dsl::*;
-    use crate::schema::texts::table;
-    use crate::Pool;
-
+    use crate::{
+        models::texts::*,
+        queries::SelectFilters,
+        schema::texts::{dsl::*, table},
+        Pool,
+    };
     use actix_web::web::Data;
-    use diesel::prelude::*;
-    use diesel::result::QueryResult;
+    use diesel::{prelude::*, result::QueryResult};
 
     /// SELECT multiple text entries
     pub fn select(filters: SelectFilters, pool: Data<Pool>) -> QueryResult<Vec<Text>> {

src/routes.rs

@@ -1,9 +1,7 @@
 //! Actix route handlers
 
 use crate::setup::Config;
-
-use actix_web::error::BlockingError;
-use actix_web::{web, HttpResponse, Responder};
+use actix_web::{error::BlockingError, web, HttpResponse, Responder};
 use chrono::{DateTime, NaiveDateTime, Utc};
 use diesel;
 use futures::future::{self, FutureResult};
@@ -92,18 +90,17 @@ pub fn get_config(config: web::Data<Config>) -> impl Responder {
 }
 
 pub mod files {
-    use crate::queries::{self, SelectQuery};
-    use crate::routes::{match_find_error, parse_id};
-    use crate::setup::Config;
-    use crate::Pool;
-
+    use crate::{
+        queries::{self, SelectQuery},
+        routes::{match_find_error, parse_id},
+        setup::Config,
+        Pool,
+    };
     use actix_files::NamedFile;
-    use actix_web::error::BlockingError;
-    use actix_web::{http, web, Error, HttpResponse};
+    use actix_web::{error::BlockingError, http, web, Error, HttpResponse};
     use chrono::Utc;
     use futures::Future;
-    use std::fs;
-    use std::path::PathBuf;
+    use std::{fs, path::PathBuf};
 
     select!(files);
 
@@ -194,12 +191,11 @@ pub mod files {
 }
 
 pub mod links {
-    use crate::queries::{self, SelectQuery};
-    use crate::routes::{
-        match_find_error, match_replace_result, parse_id, timestamp_to_last_modified,
+    use crate::{
+        queries::{self, SelectQuery},
+        routes::{match_find_error, match_replace_result, parse_id, timestamp_to_last_modified},
+        Pool,
     };
-    use crate::Pool;
-
     use actix_web::{web, Error, HttpResponse};
     use futures::Future;
 
@@ -246,12 +242,11 @@ pub mod links {
 }
 
 pub mod texts {
-    use crate::queries::{self, SelectQuery};
-    use crate::routes::{
-        match_find_error, match_replace_result, parse_id, timestamp_to_last_modified,
+    use crate::{
+        queries::{self, SelectQuery},
+        routes::{match_find_error, match_replace_result, parse_id, timestamp_to_last_modified},
+        Pool,
     };
-    use crate::Pool;
-
     use actix_web::{web, Error, HttpResponse};
     use futures::Future;
 

src/setup.rs

@@ -1,27 +1,27 @@
 //! Utilities used during the initial setup
 
 use crate::Pool;
-
 use actix_web::middleware::Logger;
 use blake2::{Blake2b, Digest};
-use diesel::r2d2::{self, ConnectionManager};
-use diesel::sqlite::SqliteConnection;
-use std::env;
-use std::path::PathBuf;
+use diesel::{
+    r2d2::{self, ConnectionManager},
+    sqlite::SqliteConnection,
+};
+use std::{env, path::PathBuf};
 
 #[cfg(not(feature = "dev"))]
 use dirs;
 #[cfg(feature = "dev")]
 use dotenv;
-#[cfg(not(feature = "dev"))]
-use std::fs;
-#[cfg(not(feature = "dev"))]
-use std::io::{self, BufRead};
-#[cfg(not(feature = "dev"))]
-use std::process;
 #[cfg(feature = "dev")]
 use std::str::FromStr;
 #[cfg(not(feature = "dev"))]
+use std::{
+    fs,
+    io::{self, BufRead},
+    process,
+};
+#[cfg(not(feature = "dev"))]
 use toml;
 
 /// Returns a path to the directory storing application data