From e7a5fcf01b4e2b77f26d81d9236731d3b02b6d16 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Sun, 28 Oct 2018 10:53:44 -0700
Subject: [PATCH] Autoformat

---
 src/api.rs        |  2 +-
 src/index.rs      |  8 ++++---
 src/rocket_api.rs | 54 +++++++++++++++++++++++++++++++++++++++--------
 3 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/api.rs b/src/api.rs
index 452c673..50450e2 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -15,7 +15,7 @@ use std::fs;
 use std::io;
 use std::ops::Deref;
 use std::path::*;
-use std::sync::{Arc};
+use std::sync::Arc;
 use typemap;
 use url::percent_encoding::percent_decode;
 
diff --git a/src/index.rs b/src/index.rs
index cefc852..8e69680 100644
--- a/src/index.rs
+++ b/src/index.rs
@@ -17,8 +17,8 @@ use std::time;
 use config::MiscSettings;
 #[cfg(test)]
 use db;
-use db::{ConnectionSource, DB};
 use db::{directories, misc_settings, songs};
+use db::{ConnectionSource, DB};
 use errors;
 use metadata;
 use vfs::{VFSSource, VFS};
@@ -42,7 +42,7 @@ struct CommandReceiver {
 
 impl CommandReceiver {
 	fn new(receiver: Receiver<Command>) -> CommandReceiver {
-		CommandReceiver{ receiver }
+		CommandReceiver { receiver }
 	}
 }
 
@@ -52,7 +52,9 @@ pub struct CommandSender {
 
 impl CommandSender {
 	fn new(sender: Sender<Command>) -> CommandSender {
-		CommandSender{ sender: Mutex::new(sender) }
+		CommandSender {
+			sender: Mutex::new(sender),
+		}
 	}
 
 	pub fn trigger_reindex(&self) -> Result<(), errors::Error> {
diff --git a/src/rocket_api.rs b/src/rocket_api.rs
index 222ea38..5aba579 100644
--- a/src/rocket_api.rs
+++ b/src/rocket_api.rs
@@ -16,7 +16,18 @@ const CURRENT_MINOR_VERSION: i32 = 2;
 const SESSION_FIELD_USERNAME: &str = "username";
 
 pub fn get_routes() -> Vec<rocket::Route> {
-	routes![version, initial_setup, get_settings, put_settings, trigger_index, auth, browse_root, browse, flatten_root, flatten]
+	routes![
+		version,
+		initial_setup,
+		get_settings,
+		put_settings,
+		trigger_index,
+		auth,
+		browse_root,
+		browse,
+		flatten_root,
+		flatten
+	]
 }
 
 struct Auth {
@@ -96,13 +107,20 @@ fn get_settings(db: State<DB>, _admin_rights: AdminRights) -> Result<Json<Config
 }
 
 #[put("/settings", data = "<config>")]
-fn put_settings(db: State<DB>, _admin_rights: AdminRights, config: Json<Config>) -> Result<(), errors::Error> {
+fn put_settings(
+	db: State<DB>,
+	_admin_rights: AdminRights,
+	config: Json<Config>,
+) -> Result<(), errors::Error> {
 	config::amend::<DB>(&db, &config)?;
 	Ok(())
 }
 
 #[post("/trigger_index")]
-fn trigger_index(command_sender: State<Arc<index::CommandSender>>, _admin_rights: AdminRights) -> Result<(), errors::Error> {
+fn trigger_index(
+	command_sender: State<Arc<index::CommandSender>>,
+	_admin_rights: AdminRights,
+) -> Result<(), errors::Error> {
 	command_sender.trigger_reindex()?;
 	Ok(())
 }
@@ -119,9 +137,16 @@ struct AuthOutput {
 }
 
 #[post("/auth", data = "<credentials>")]
-fn auth(db: State<DB>, credentials: Json<AuthCredentials>, mut cookies: Cookies) -> Result<(Json<AuthOutput>), errors::Error> {
+fn auth(
+	db: State<DB>,
+	credentials: Json<AuthCredentials>,
+	mut cookies: Cookies,
+) -> Result<(Json<AuthOutput>), errors::Error> {
 	user::auth::<DB>(&db, &credentials.username, &credentials.password)?;
-	cookies.add_private(Cookie::new(SESSION_FIELD_USERNAME, credentials.username.clone()));
+	cookies.add_private(Cookie::new(
+		SESSION_FIELD_USERNAME,
+		credentials.username.clone(),
+	));
 
 	let auth_output = AuthOutput {
 		admin: user::is_admin::<DB>(&db, &credentials.username)?,
@@ -130,13 +155,20 @@ fn auth(db: State<DB>, credentials: Json<AuthCredentials>, mut cookies: Cookies)
 }
 
 #[get("/browse")]
-fn browse_root(db: State<DB>, _auth: Auth) -> Result<(Json<Vec<index::CollectionFile>>), errors::Error> {
+fn browse_root(
+	db: State<DB>,
+	_auth: Auth,
+) -> Result<(Json<Vec<index::CollectionFile>>), errors::Error> {
 	let result = index::browse::<DB>(&db, &PathBuf::new())?;
 	Ok(Json(result))
 }
 
 #[get("/browse/<path..>")]
-fn browse(db: State<DB>, _auth: Auth, path: PathBuf) -> Result<(Json<Vec<index::CollectionFile>>), errors::Error> {
+fn browse(
+	db: State<DB>,
+	_auth: Auth,
+	path: PathBuf,
+) -> Result<(Json<Vec<index::CollectionFile>>), errors::Error> {
 	let result = index::browse::<DB>(&db, &path)?;
 	Ok(Json(result))
 }
@@ -148,7 +180,11 @@ fn flatten_root(db: State<DB>, _auth: Auth) -> Result<(Json<Vec<index::Song>>),
 }
 
 #[get("/flatten/<path..>")]
-fn flatten(db: State<DB>, _auth: Auth, path: PathBuf) -> Result<(Json<Vec<index::Song>>), errors::Error> {
+fn flatten(
+	db: State<DB>,
+	_auth: Auth,
+	path: PathBuf,
+) -> Result<(Json<Vec<index::Song>>), errors::Error> {
 	let result = index::flatten::<DB>(&db, &path)?;
 	Ok(Json(result))
-}
\ No newline at end of file
+}