From b0112c06d6876bf01ae0394ffd49b016e7be49bf Mon Sep 17 00:00:00 2001 From: Mylloon Date: Mon, 24 Apr 2023 12:18:21 +0200 Subject: [PATCH] use to_owned instead of clone --- src/config.rs | 8 ++++++-- src/main.rs | 6 +++--- src/misc/github.rs | 6 +++--- src/routes/agreements.rs | 2 +- src/routes/blog.rs | 4 ++-- src/routes/contrib.rs | 12 ++++++------ src/routes/index.rs | 2 +- src/routes/networks.rs | 2 +- src/routes/not_found.rs | 2 +- src/routes/portfolio.rs | 2 +- src/routes/web3.rs | 2 +- src/template.rs | 2 +- 12 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/config.rs b/src/config.rs index 9a7c8a1..fd11cef 100644 --- a/src/config.rs +++ b/src/config.rs @@ -93,10 +93,14 @@ pub fn get_config(file_path: &str) -> Config { let static_dir = "static".to_owned(); let templates_dir = "templates".to_owned(); - let files_root = init("dist".to_owned(), static_dir.clone(), templates_dir.clone()); + let files_root = init( + "dist".to_owned(), + static_dir.to_owned(), + templates_dir.to_owned(), + ); Config { - fc: internal_config.clone(), + fc: internal_config.to_owned(), static_location: format!("{}/{}", files_root, static_dir), tmpl: Template { directory: format!("{}/{}", files_root, templates_dir), diff --git a/src/main.rs b/src/main.rs index 05e8aa0..f02c1e0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,14 +20,14 @@ async fn main() -> Result<()> { println!( "Listening to {}://{}:{}", - config.clone().fc.scheme.unwrap(), + config.to_owned().fc.scheme.unwrap(), addr.0, addr.1 ); HttpServer::new(move || { App::new() - .app_data(web::Data::new(config.clone())) + .app_data(web::Data::new(config.to_owned())) .wrap(DefaultHeaders::new().add(( "Onion-Location", config.fc.onion.as_deref().unwrap_or_default(), @@ -46,7 +46,7 @@ async fn main() -> Result<()> { .service(gaming::page) .service(cours::page) .service(cv::page) - .service(Files::new("/", config.static_location.clone())) + .service(Files::new("/", config.static_location.to_owned())) .default_service(web::to(not_found::page)) }) .bind(addr)? diff --git a/src/misc/github.rs b/src/misc/github.rs index 2d7736a..5fff66c 100644 --- a/src/misc/github.rs +++ b/src/misc/github.rs @@ -68,7 +68,7 @@ pub async fn fetch_pr() -> Result, Error> { resp.items.iter().for_each(|p| { list.push(Project { project: p.repository_url.split('/').last().unwrap().to_owned(), - project_url: p.repository_url.clone(), + project_url: p.repository_url.to_owned(), status: if p.pull_request.merged_at.is_none() { if p.state == "closed" { ProjectState::Closed @@ -78,9 +78,9 @@ pub async fn fetch_pr() -> Result, Error> { } else { ProjectState::Merged }, - title: p.title.clone(), + title: p.title.to_owned(), id: p.number, - contrib_url: p.pull_request.html_url.clone(), + contrib_url: p.pull_request.html_url.to_owned(), }); }); diff --git a/src/routes/agreements.rs b/src/routes/agreements.rs index d529d2e..13cd744 100644 --- a/src/routes/agreements.rs +++ b/src/routes/agreements.rs @@ -8,7 +8,7 @@ use ramhorns::Content; #[get("/security.txt")] pub async fn security(req: HttpRequest, config: web::Data) -> impl Responder { HttpResponse::Ok().body(build_securitytxt( - config.get_ref().clone(), + config.get_ref().to_owned(), req.connection_info().to_owned(), )) } diff --git a/src/routes/blog.rs b/src/routes/blog.rs index c96226f..72c013c 100644 --- a/src/routes/blog.rs +++ b/src/routes/blog.rs @@ -15,7 +15,7 @@ use crate::{ #[get("/blog")] pub async fn index(config: web::Data) -> impl Responder { - HttpResponse::Ok().body(build_index(config.get_ref().clone())) + HttpResponse::Ok().body(build_index(config.get_ref().to_owned())) } #[derive(Content)] @@ -115,7 +115,7 @@ struct BlogPostTemplate { #[get("/blog/{id}")] pub async fn page(path: web::Path<(String,)>, config: web::Data) -> impl Responder { - HttpResponse::Ok().body(build_post(path.into_inner().0, config.get_ref().clone())) + HttpResponse::Ok().body(build_post(path.into_inner().0, config.get_ref().to_owned())) } pub fn build_post(file: String, config: Config) -> String { diff --git a/src/routes/contrib.rs b/src/routes/contrib.rs index ddae482..5200c42 100644 --- a/src/routes/contrib.rs +++ b/src/routes/contrib.rs @@ -11,7 +11,7 @@ use ramhorns::Content; #[get("/contrib")] pub async fn page(config: web::Data) -> impl Responder { - HttpResponse::Ok().body(build_page(config.get_ref().clone()).await) + HttpResponse::Ok().body(build_page(config.get_ref().to_owned()).await) } #[derive(Content)] @@ -51,7 +51,7 @@ pub async fn build_page(config: Config) -> String { let mut map: HashMap<&str, Vec> = HashMap::new(); projects.iter().for_each(|p| { let project = Pull { - url: p.contrib_url.clone(), + url: p.contrib_url.to_owned(), id: p.id, name_repo: p.project.to_owned(), title: p.title.to_owned(), @@ -63,7 +63,7 @@ pub async fn build_page(config: Config) -> String { } else { data.push(Project { name: project_name.to_owned(), - url: p.project_url.clone(), + url: p.project_url.to_owned(), pulls_merged: Vec::new(), pulls_closed: Vec::new(), pulls_open: Vec::new(), @@ -77,9 +77,9 @@ pub async fn build_page(config: Config) -> String { map.get(d.name.as_str()).unwrap().iter().for_each(|p| { let state = p.state.into(); match state { - ProjectState::Closed => d.pulls_closed.push(p.clone()), - ProjectState::Merged => d.pulls_merged.push(p.clone()), - ProjectState::Open => d.pulls_open.push(p.clone()), + ProjectState::Closed => d.pulls_closed.push(p.to_owned()), + ProjectState::Merged => d.pulls_merged.push(p.to_owned()), + ProjectState::Open => d.pulls_open.push(p.to_owned()), } }); let mut name: Vec = d.name.replace('-', " ").chars().collect(); diff --git a/src/routes/index.rs b/src/routes/index.rs index 1becf03..a37308c 100644 --- a/src/routes/index.rs +++ b/src/routes/index.rs @@ -5,7 +5,7 @@ use crate::{config::Config, template::Infos}; #[get("/")] pub async fn page(config: web::Data) -> impl Responder { - HttpResponse::Ok().body(build_page(config.get_ref().clone())) + HttpResponse::Ok().body(build_page(config.get_ref().to_owned())) } #[once(time = 60)] diff --git a/src/routes/networks.rs b/src/routes/networks.rs index 7c6f573..db8c308 100644 --- a/src/routes/networks.rs +++ b/src/routes/networks.rs @@ -5,7 +5,7 @@ use crate::{config::Config, template::Infos}; #[get("/networks")] pub async fn page(config: web::Data) -> impl Responder { - HttpResponse::Ok().body(build_page(config.get_ref().clone())) + HttpResponse::Ok().body(build_page(config.get_ref().to_owned())) } #[once(time = 60)] diff --git a/src/routes/not_found.rs b/src/routes/not_found.rs index c8dddf0..7665ff3 100644 --- a/src/routes/not_found.rs +++ b/src/routes/not_found.rs @@ -4,7 +4,7 @@ use cached::proc_macro::once; use crate::{config::Config, template::Infos}; pub async fn page(config: web::Data) -> impl Responder { - HttpResponse::NotFound().body(build_page(config.get_ref().clone())) + HttpResponse::NotFound().body(build_page(config.get_ref().to_owned())) } #[once(time = 60)] diff --git a/src/routes/portfolio.rs b/src/routes/portfolio.rs index 7090b88..ddcd15d 100644 --- a/src/routes/portfolio.rs +++ b/src/routes/portfolio.rs @@ -11,7 +11,7 @@ use crate::{ #[get("/portfolio")] pub async fn page(config: web::Data) -> impl Responder { - HttpResponse::Ok().body(build_page(config.get_ref().clone())) + HttpResponse::Ok().body(build_page(config.get_ref().to_owned())) } #[derive(Content)] diff --git a/src/routes/web3.rs b/src/routes/web3.rs index 307230d..82d341e 100644 --- a/src/routes/web3.rs +++ b/src/routes/web3.rs @@ -5,7 +5,7 @@ use crate::{config::Config, template::Infos}; #[get("/web3")] pub async fn page(config: web::Data) -> impl Responder { - HttpResponse::Ok().body(build_page(config.get_ref().clone())) + HttpResponse::Ok().body(build_page(config.get_ref().to_owned())) } #[once(time = 60)] diff --git a/src/template.rs b/src/template.rs index 5e500c7..a24c2db 100644 --- a/src/template.rs +++ b/src/template.rs @@ -41,7 +41,7 @@ impl Template { let tplt = templates.from_file(template).unwrap(); tplt.render(&Data { - app_name: self.app_name.clone(), + app_name: self.app_name.to_owned(), page_title: info.page_title, page_desc: info.page_desc, page_kw: info.page_kw,