diff --git a/src/main.rs b/src/main.rs index 2ee2348..6ceb617 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,6 @@ use actix_files::Files; use actix_web::{middleware::DefaultHeaders, web, App, HttpServer}; +use std::io::Result; mod config; mod template; @@ -27,7 +28,7 @@ mod portfolio; mod contrib; #[actix_web::main] -async fn main() -> std::io::Result<()> { +async fn main() -> Result<()> { let config = config::get_config("./config/config.toml"); let addr = ("0.0.0.0", config.fc.port.unwrap()); diff --git a/src/routes/contrib.rs b/src/routes/contrib.rs index b463c84..989cec3 100644 --- a/src/routes/contrib.rs +++ b/src/routes/contrib.rs @@ -40,7 +40,7 @@ struct Pull { } #[once(time = 120)] -pub async fn get_page(config: Config) -> std::string::String { +pub async fn get_page(config: Config) -> String { // Fetch latest data from github let data = match fetch_pr().await { Ok(projects) => { diff --git a/src/routes/index.rs b/src/routes/index.rs index 6583647..5597de2 100644 --- a/src/routes/index.rs +++ b/src/routes/index.rs @@ -13,7 +13,7 @@ pub async fn page(config: web::Data) -> impl Responder { struct IndexTemplate {} #[once(time = 60)] -pub fn get_page(config: Config) -> std::string::String { +pub fn get_page(config: Config) -> String { config.tmpl.render( "index.html", IndexTemplate {}, diff --git a/src/routes/networks.rs b/src/routes/networks.rs index fd926e5..383377a 100644 --- a/src/routes/networks.rs +++ b/src/routes/networks.rs @@ -13,7 +13,7 @@ pub async fn page(config: web::Data) -> impl Responder { struct NetworksTemplate {} #[once(time = 60)] -pub fn get_page(config: Config) -> std::string::String { +pub fn get_page(config: Config) -> String { config.tmpl.render( "networks.html", NetworksTemplate {}, diff --git a/src/routes/not_found.rs b/src/routes/not_found.rs index 051d00c..20cf657 100644 --- a/src/routes/not_found.rs +++ b/src/routes/not_found.rs @@ -12,7 +12,7 @@ pub async fn page(config: web::Data) -> impl Responder { struct Error404Template {} #[once(time = 60)] -pub fn get_page(config: Config) -> std::string::String { +pub fn get_page(config: Config) -> String { config .tmpl .render("404.html", Error404Template {}, Infos::default()) diff --git a/src/routes/portfolio.rs b/src/routes/portfolio.rs index 34349d5..afd07f1 100644 --- a/src/routes/portfolio.rs +++ b/src/routes/portfolio.rs @@ -21,7 +21,7 @@ struct PortfolioTemplate { } #[once(time = 60)] -pub fn get_page(config: Config) -> std::string::String { +pub fn get_page(config: Config) -> String { let projects_dir = "data/projects"; let ext = ".md"; diff --git a/src/template.rs b/src/template.rs index 9956d1e..847f41f 100644 --- a/src/template.rs +++ b/src/template.rs @@ -1,5 +1,6 @@ use ramhorns::{Content, Ramhorns}; use serde::Deserialize; +use std::fs; #[derive(Clone)] pub struct Template { @@ -72,7 +73,7 @@ pub struct File { pub fn read_md(filename: &str) -> File { // Read markdown file - let mut text = std::fs::read_to_string(filename).unwrap(); + let mut text = fs::read_to_string(filename).unwrap(); // Transform LaTeX to MathML text = latex2mathml::replace(&text).unwrap();