Avoid unecessary copies

This commit is contained in:
Antoine Gersant 2020-11-26 19:30:42 -08:00
parent 875a52f1b2
commit 1ffea255df
2 changed files with 18 additions and 18 deletions

View file

@ -228,9 +228,9 @@ fn main() -> Result<()> {
let thumbnails_manager = thumbnails::ThumbnailsManager::new(&thumbnails_path); let thumbnails_manager = thumbnails::ThumbnailsManager::new(&thumbnails_path);
// Endpoints // Endpoints
let api_url = "/api".to_owned(); let api_url = "/api";
let swagger_url = "/swagger".to_owned(); let swagger_url = "/swagger";
let web_url = "/".to_owned(); let web_url = "/";
info!("Mounting API on {}", api_url); info!("Mounting API on {}", api_url);
info!("Mounting web client files on {}", web_url); info!("Mounting web client files on {}", web_url);
info!("Mounting swagger files on {}", swagger_url); info!("Mounting swagger files on {}", swagger_url);
@ -258,9 +258,9 @@ fn main() -> Result<()> {
&auth_secret, &auth_secret,
api_url, api_url,
web_url, web_url,
web_dir_path, &web_dir_path,
swagger_url, swagger_url,
swagger_dir_path, &swagger_dir_path,
db_server, db_server,
index, index,
thumbnails_manager, thumbnails_manager,

View file

@ -2,7 +2,7 @@ use anyhow::*;
use rocket; use rocket;
use rocket::config::{Environment, LoggingLevel}; use rocket::config::{Environment, LoggingLevel};
use rocket_contrib::serve::{Options, StaticFiles}; use rocket_contrib::serve::{Options, StaticFiles};
use std::path::PathBuf; use std::path::Path;
use super::api; use super::api;
use crate::db::DB; use crate::db::DB;
@ -14,9 +14,9 @@ pub fn get_server(
auth_secret: &[u8], auth_secret: &[u8],
api_url: &str, api_url: &str,
web_url: &str, web_url: &str,
web_dir_path: &PathBuf, web_dir_path: &Path,
swagger_url: &str, swagger_url: &str,
swagger_dir_path: &PathBuf, swagger_dir_path: &Path,
db: DB, db: DB,
command_sender: Index, command_sender: Index,
thumbnails_manager: ThumbnailsManager, thumbnails_manager: ThumbnailsManager,
@ -52,11 +52,11 @@ pub fn get_server(
pub fn run( pub fn run(
port: u16, port: u16,
auth_secret: &[u8], auth_secret: &[u8],
api_url: String, api_url: &str,
web_url: String, web_url: &str,
web_dir_path: PathBuf, web_dir_path: &Path,
swagger_url: String, swagger_url: &str,
swagger_dir_path: PathBuf, swagger_dir_path: &Path,
db: DB, db: DB,
command_sender: Index, command_sender: Index,
thumbnails_manager: ThumbnailsManager, thumbnails_manager: ThumbnailsManager,
@ -64,11 +64,11 @@ pub fn run(
let server = get_server( let server = get_server(
port, port,
auth_secret, auth_secret,
&api_url, api_url,
&web_url, web_url,
&web_dir_path, web_dir_path,
&swagger_url, swagger_url,
&swagger_dir_path, swagger_dir_path,
db, db,
command_sender, command_sender,
thumbnails_manager, thumbnails_manager,