From 7bbc6b8d5db377e05410495f337f41be3b9e5fa3 Mon Sep 17 00:00:00 2001 From: Lilly Rosaline Date: Sat, 2 Jul 2022 00:52:19 -0500 Subject: [PATCH] minor refactors here and there --- .gitignore | 1 + Cargo.toml | 3 +++ src/main.rs | 22 +++++++++------------- 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ea8c4bf --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/target diff --git a/Cargo.toml b/Cargo.toml index 473addf..fc7ae06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[profile.release] +opt-level = 3 + [dependencies] serde = { version = "1.0", features = ["derive"] } toml = "0.5" diff --git a/src/main.rs b/src/main.rs index bee900e..c5dd929 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,10 @@ -use chrono::{DateTime, NaiveDateTime}; +use chrono::NaiveDateTime; use html5ever::tendril::SliceExt; -use nipper::{Document, Node, Selection}; +use nipper::{Document, Selection}; use rayon::prelude::*; use regex::Regex; use serde::Deserialize; -use std::borrow::{Borrow, Cow}; + use std::env::current_dir; use std::fs; use std::fs::{read_to_string, File}; @@ -68,8 +68,8 @@ fn main() -> Result<(), Error> { let index = Document::from(read_to_string(index_file)?.as_str()); for post in &posts { let template_html = Document::from(template.as_str()); - let mut output_html = template_html; - let mut typeset_elements = output_html.select("meta[typeset]"); + let output_html = template_html; + let typeset_elements = output_html.select("meta[typeset]"); for mut element in typeset_elements.iter() { match element.attr("typeset").unwrap().to_string().as_str() { "page-title" => { @@ -78,7 +78,7 @@ fn main() -> Result<(), Error> { .unwrap() .replace("$", post.title.as_str()); - element.replace_with_html(format!(r#"{}"#, title)); + element.replace_with_html(format!(r#"{title}"#)); } "title" => { element.replace_with_html(post.title.to_string()); @@ -94,7 +94,7 @@ fn main() -> Result<(), Error> { } } let output = output_html.html().to_string(); - let path = out_path.join(PathBuf::from(format!("{}{}", &post.id, ".html"))); + let path = out_path.join(PathBuf::from(format!("{}.html", &post.id))); let mut file = File::create(path)?; file.write_all(output.as_bytes())?; } @@ -104,7 +104,7 @@ fn main() -> Result<(), Error> { "Found {} post lists", index.select(r#"meta[typeset="index-entry""#).length() ); - for mut index_ref in index.select(r#"meta[typeset="index-entry""#).iter() { + for index_ref in index.select(r#"meta[typeset="index-entry""#).iter() { let n = index_ref .attr("content") .unwrap_or("".to_tendril()) @@ -119,11 +119,7 @@ fn main() -> Result<(), Error> { nth_children(parent.parent(), n) .select(r#"meta[typeset="index-entry""#) .replace_with_html( - format!( - "{}\n", - post.id, post.title - ) - .as_str(), + format!("{}\n", post.id, post.title).as_str(), ); } parent.parent().children().iter().nth(0).unwrap().remove();