diff options
| author | Ben Bridle <bridle.benjamin@gmail.com> | 2025-10-10 16:33:08 +1300 |
|---|---|---|
| committer | Ben Bridle <bridle.benjamin@gmail.com> | 2025-10-10 16:33:08 +1300 |
| commit | 36a653e04195503ff05121c72f8a105527d8a921 (patch) | |
| tree | 159e9716a6e7aada62c26a2d31bb7dade8cdb692 | |
| parent | 5a034625f07731459a79590a910d2a5177f316d7 (diff) | |
| download | toaster-36a653e04195503ff05121c72f8a105527d8a921.zip | |
Remove document parameter from functions
The markdown document is already passed as a field on the page
argument, so passing it in as a separate argument was redundant.
| -rw-r--r-- | src/generate_html.rs | 8 | ||||
| -rw-r--r-- | src/main.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/generate_html.rs b/src/generate_html.rs index 0460cf7..4d14950 100644 --- a/src/generate_html.rs +++ b/src/generate_html.rs @@ -4,7 +4,7 @@ use markdown::*; use recipe::*; -pub fn generate_html(document: &MarkdownDocument, page: &Page, website: &Website) -> String { +pub fn generate_html(page: &Page, website: &Website) -> String { let root = page.root(); let page_name = sanitize_text(&page.name, true); let site_name = sanitize_text(&website.name, true); @@ -27,7 +27,7 @@ pub fn generate_html(document: &MarkdownDocument, page: &Page, website: &Website let toc_side = if page.headings.len() > 3 { format!("<div>{toc}</div>\n") } else { String::new() }; - let main = document_to_html(document, page, website); let main = main.trim(); + let main = document_to_html(page, website); let main = main.trim(); format!("\ <!DOCTYPE html> @@ -120,7 +120,7 @@ pub fn get_table_of_contents(page: &Page) -> String { } -pub fn document_to_html(document: &MarkdownDocument, page: &Page, website: &Website) -> String { +pub fn document_to_html(page: &Page, website: &Website) -> String { let from = &page; let root = page.root(); let mut html = String::new(); @@ -137,7 +137,7 @@ pub fn document_to_html(document: &MarkdownDocument, page: &Page, website: &Webs ($t:expr,$f:expr) => {{ html!("<{}>", $t); $f; html!("</{}>", $t); }}; } wrap!("article", - for block in &document.blocks { + for block in &page.document.blocks { match block { Block::Heading { level, line } => { if let Level::Heading1 = level { diff --git a/src/main.rs b/src/main.rs index 1ea25d2..e52aa10 100644 --- a/src/main.rs +++ b/src/main.rs @@ -100,7 +100,7 @@ fn main() { destination.push(&page.full_url); // Convert document to different formats. if export_html { - let html = generate_html(&page.document, page, &website); + let html = generate_html(page, &website); write_file(&html, &destination, "html", page.last_modified); } // Copy original markdown file. |