diff --git a/Cargo.lock b/Cargo.lock index ee9190b..864a24f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -47,7 +47,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blades" -version = "0.3.0" +version = "0.3.1" dependencies = [ "arrayvec", "beef", @@ -56,7 +56,7 @@ dependencies = [ "clap_derive", "cmark-syntax", "fnv", - "hashbrown 0.12.1", + "hashbrown", "pulldown-cmark", "ramhorns", "rayon", @@ -191,14 +191,7 @@ name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - -[[package]] -name = "hashbrown" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" dependencies = [ - "rayon", "serde", ] @@ -233,7 +226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown", ] [[package]] @@ -389,8 +382,9 @@ dependencies = [ [[package]] name = "ramhorns" -version = "0.13.0" -source = "git+https://github.com/grego/ramhorns?branch=shorthand#b6c675c767a6f32dbf348d843602ee5120aec5a8" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47008ae2e2a9085a3f658203609d79f8a027829cf88a088d0c0084e18ba8f0b9" dependencies = [ "arrayvec", "beef", @@ -402,8 +396,9 @@ dependencies = [ [[package]] name = "ramhorns-derive" -version = "0.13.0" -source = "git+https://github.com/grego/ramhorns?branch=shorthand#b6c675c767a6f32dbf348d843602ee5120aec5a8" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ada9bbdd21adf426f932bf76b3db7d553538dffc16afd5fb8ce2ce2110a75536" dependencies = [ "bae", "fnv", diff --git a/Cargo.toml b/Cargo.toml index c8289cf..2d1716a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "blades" -version = "0.3.0" +version = "0.3.1" authors = ["Maroš Grego "] edition = "2021" description = "Blazing fast dead simple static site generator" @@ -12,13 +12,13 @@ readme = "README.md" homepage = "https://www.getblades.org" [dependencies] -ramhorns = { git = "https://github.com/grego/ramhorns", branch = "shorthand" } +ramhorns = "0.14" arrayvec = { version = "0.7", features = ["serde"] } beef = { version = "0.5", features = ["impl_serde"]} serde = { version = "^1.0.126", features = ["derive"] } chrono = { version = "^0.4.19", features = ["std", "serde"], default_features = false } fnv = "1.0" -hashbrown = { version = "0.12.1", features = ["inline-more", "serde"], default_features = false } +hashbrown = { version = "0.11", features = ["inline-more", "serde"], default_features = false } serde-cmd = "0.1.3" pulldown-cmark = { version = "0.9", default_features = false } cmark-syntax = "0.3" @@ -26,13 +26,13 @@ cmark-syntax = "0.3" # Cargo doesn't support binary-only dependencies yet. toml = { version = "0.5.9", optional = true } rayon = { version = "1.5.3", optional = true } -clap = { version = "3.1.18", optional = true, default_features = false, features = ["std"] } -clap_derive = { version = "3.1.18", optional = true } +clap = { version = "3.1", optional = true, default_features = false, features = ["std"] } +clap_derive = { version = "3.1", optional = true } thiserror = { version = "1.0.31", optional = true } serde_json = { version = "1", optional = true } [features] -bin = ["toml", "rayon", "clap", "clap_derive", "thiserror", "serde_json", "hashbrown/rayon"] +bin = ["toml", "rayon", "clap", "clap_derive", "thiserror", "serde_json"] mathml = ["cmark-syntax/latex2mathml"] default = ["bin", "mathml"] @@ -44,6 +44,3 @@ codegen-units = 1 [profile.bench] lto = true - -[patch.crates-io] -ramhorns-derive = { git = "https://github.com/grego/ramhorns", branch = "shorthand" } diff --git a/src/main.rs b/src/main.rs index 3bc12a7..a5f9a24 100644 --- a/src/main.rs +++ b/src/main.rs @@ -369,12 +369,12 @@ fn build(config: &Config) -> Result<(), Error> { }) }, || -> Result<(), Error> { - taxonomies.par_iter().try_for_each(|(_, taxonomy)| { + for (_, taxonomy) in taxonomies.iter() { taxonomy.render(config, &taxonomies, &pages, &templates, &rendered)?; - taxonomy.keys().par_iter().try_for_each(|(n, l)| { - taxonomy.render_key((n, l), config, &taxonomies, &pages, &templates, &rendered) - }) - })?; + for (n, l) in taxonomy.keys().iter() { + taxonomy.render_key((n, l), config, &taxonomies, &pages, &templates, &rendered)?; + } + }; render_meta(&pages, &taxonomies, config).map_err(Into::into) }, );