From 1ffea255dfb42d7b8063a386f791b1bcb128f576 Mon Sep 17 00:00:00 2001
From: Antoine Gersant <antoine.gersant@lesforges.org>
Date: Thu, 26 Nov 2020 19:30:42 -0800
Subject: [PATCH] Avoid unecessary copies

---
 src/main.rs                  | 10 +++++-----
 src/service/rocket/server.rs | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 1d0c65e..57b2a55 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -228,9 +228,9 @@ fn main() -> Result<()> {
 	let thumbnails_manager = thumbnails::ThumbnailsManager::new(&thumbnails_path);
 
 	// Endpoints
-	let api_url = "/api".to_owned();
-	let swagger_url = "/swagger".to_owned();
-	let web_url = "/".to_owned();
+	let api_url = "/api";
+	let swagger_url = "/swagger";
+	let web_url = "/";
 	info!("Mounting API on {}", api_url);
 	info!("Mounting web client files on {}", web_url);
 	info!("Mounting swagger files on {}", swagger_url);
@@ -258,9 +258,9 @@ fn main() -> Result<()> {
 			&auth_secret,
 			api_url,
 			web_url,
-			web_dir_path,
+			&web_dir_path,
 			swagger_url,
-			swagger_dir_path,
+			&swagger_dir_path,
 			db_server,
 			index,
 			thumbnails_manager,
diff --git a/src/service/rocket/server.rs b/src/service/rocket/server.rs
index 594566f..5388a83 100644
--- a/src/service/rocket/server.rs
+++ b/src/service/rocket/server.rs
@@ -2,7 +2,7 @@ use anyhow::*;
 use rocket;
 use rocket::config::{Environment, LoggingLevel};
 use rocket_contrib::serve::{Options, StaticFiles};
-use std::path::PathBuf;
+use std::path::Path;
 
 use super::api;
 use crate::db::DB;
@@ -14,9 +14,9 @@ pub fn get_server(
 	auth_secret: &[u8],
 	api_url: &str,
 	web_url: &str,
-	web_dir_path: &PathBuf,
+	web_dir_path: &Path,
 	swagger_url: &str,
-	swagger_dir_path: &PathBuf,
+	swagger_dir_path: &Path,
 	db: DB,
 	command_sender: Index,
 	thumbnails_manager: ThumbnailsManager,
@@ -52,11 +52,11 @@ pub fn get_server(
 pub fn run(
 	port: u16,
 	auth_secret: &[u8],
-	api_url: String,
-	web_url: String,
-	web_dir_path: PathBuf,
-	swagger_url: String,
-	swagger_dir_path: PathBuf,
+	api_url: &str,
+	web_url: &str,
+	web_dir_path: &Path,
+	swagger_url: &str,
+	swagger_dir_path: &Path,
 	db: DB,
 	command_sender: Index,
 	thumbnails_manager: ThumbnailsManager,
@@ -64,11 +64,11 @@ pub fn run(
 	let server = get_server(
 		port,
 		auth_secret,
-		&api_url,
-		&web_url,
-		&web_dir_path,
-		&swagger_url,
-		&swagger_dir_path,
+		api_url,
+		web_url,
+		web_dir_path,
+		swagger_url,
+		swagger_dir_path,
 		db,
 		command_sender,
 		thumbnails_manager,