diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f9dfd0..faa900d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,13 +17,6 @@ A dependency update to an incompatible version is considered a breaking change. ## Unreleased -## v0.2.0 - 2025-01-01 - -### Changed - -- **(breaking)** Updated `axum-core` dependency to `0.5.0` -- Relaxed lower bound on `http` dependency to `1.0.0` - ## v0.1.3 - 2024-12-21 ### Added diff --git a/Cargo.toml b/Cargo.toml index b976823..81cf422 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "el" -version = "0.2.0" -edition = "2024" +version = "0.1.3" +edition = "2021" authors = ["Garmelon "] description = "Write and manipulate HTML elements as data" -repository = "https://git.plugh.de/Garmelon/el" +repository = "https://github.com/Garmelon/el" license = "MIT OR Apache-2.0" keywords = ["html", "svg", "mathml", "hiccup"] categories = ["web-programming", "template-engine"] @@ -13,18 +13,16 @@ categories = ["web-programming", "template-engine"] axum = ["dep:axum-core", "dep:http"] [dependencies] -axum-core = { version = "0.5.0", optional = true } -http = { version = "1.0.0", optional = true } +axum-core = { version = "0.4.5", optional = true } +http = { version = "1.1.0", optional = true } [lints] rust.unsafe_code = { level = "forbid", priority = 1 } # Lint groups -rust.deprecated-safe = "warn" -rust.future-incompatible = "warn" -rust.keyword-idents = "warn" -rust.nonstandard-style = "warn" -rust.refining-impl-trait = "warn" -rust.rust-2018-idioms = "warn" +rust.deprecated_safe = "warn" +rust.future_incompatible = "warn" +rust.keyword_idents = "warn" +rust.rust_2018_idioms = "warn" rust.unused = "warn" # Individual lints rust.let_underscore_drop = "warn" diff --git a/README.md b/README.md index 842db85..c3c9bc5 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ See the top-level crate documentation for more info. ## But what about that small helper function? -Here it is in full, for posterity: +Here it is in full, for posteriority: ```js function el(name, attributes, ...children) { diff --git a/src/axum.rs b/src/axum.rs index d0b7c64..44059bb 100644 --- a/src/axum.rs +++ b/src/axum.rs @@ -1,5 +1,5 @@ use axum_core::response::IntoResponse; -use http::{HeaderValue, StatusCode, header}; +use http::{header, HeaderValue, StatusCode}; use crate::{Document, Render}; diff --git a/src/check.rs b/src/check.rs index 01f3a59..c4f3387 100644 --- a/src/check.rs +++ b/src/check.rs @@ -58,9 +58,10 @@ pub fn is_valid_raw_text(tag_name: &str, text: &str) -> bool { // "[...] followed by characters that case-insensitively match the tag // name of the element [...]" // - // Note: Since we know that tag names are ascii-only, we can use an - // ASCII-based case insensitive comparison without unicode shenanigans. - if !potential_tag_name.eq_ignore_ascii_case(tag_name) { + // Note: Since we know that tag names are ascii-only, we can convert + // both to lowercase for a case-insensitive comparison without weird + // unicode shenanigans. + if potential_tag_name.to_ascii_lowercase() != tag_name.to_ascii_lowercase() { continue; } diff --git a/src/element.rs b/src/element.rs index b2b12e0..b8fd828 100644 --- a/src/element.rs +++ b/src/element.rs @@ -1,4 +1,4 @@ -use std::collections::{BTreeMap, HashMap, btree_map::Entry}; +use std::collections::{btree_map::Entry, BTreeMap, HashMap}; /// The kind of an element. /// @@ -501,12 +501,8 @@ element_component_tuple!(C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11); element_component_tuple!(C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12); element_component_tuple!(C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13); element_component_tuple!(C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14); -element_component_tuple!( - C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15 -); -element_component_tuple!( - C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16 -); +element_component_tuple!(C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15); +element_component_tuple!(C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16); /// A full HTML document including doctype. /// diff --git a/src/lib.rs b/src/lib.rs index bf907f6..921d6dc 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -84,7 +84,7 @@ pub use self::{element::*, render::*}; #[cfg(test)] mod tests { - use crate::{Attr, Content, Element, Render, html::*}; + use crate::{html::*, Attr, Content, Element, Render}; #[test] fn simple_website() { @@ -130,11 +130,9 @@ mod tests { assert!(script("hello world").render_to_string().is_err()); - assert!( - script("hello