diff --git a/Cargo.toml b/Cargo.toml
index ece8239..afd7732 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,10 +10,10 @@ members = [
     "crates/rangular-runtime",
 ]
 exclude = ["demo-leptos", "demo-tauri/src"]
-resolver = "2"
+resolver = "3"
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 version = "1.0.2"
 authors = ["Interchouette"]
diff --git a/crates/rangular-aot/src/emit.rs b/crates/rangular-aot/src/emit.rs
index 5416695..e051238 100644
--- a/crates/rangular-aot/src/emit.rs
+++ b/crates/rangular-aot/src/emit.rs
@@ -1,4 +1,4 @@
-use rangular_parser::{builtin_tag_io, classify_bindings, parse, Diagnostic};
+use rangular_parser::{Diagnostic, builtin_tag_io, classify_bindings, parse};
 
 use crate::error::{AotIssue, EmitResult, EmitTokens};
 use crate::lower::{emit_rust, emit_rust_tokens};
diff --git a/crates/rangular-aot/src/glue.rs b/crates/rangular-aot/src/glue.rs
index fa30c9a..74c589f 100644
--- a/crates/rangular-aot/src/glue.rs
+++ b/crates/rangular-aot/src/glue.rs
@@ -2,8 +2,8 @@ use std::cell::RefCell;
 use std::rc::Rc;
 use std::sync::Arc;
 
-use rangular_expr::{eval_with_pipes, Expr, Host, PipeRegistry, Value};
-use rangular_host::{for_implicit_value, EventPayload, LoopScope};
+use rangular_expr::{Expr, Host, PipeRegistry, Value, eval_with_pipes};
+use rangular_host::{EventPayload, LoopScope, for_implicit_value};
 use send_wrapper::SendWrapper;
 
 /// Shared host handle for AOT-generated views.
diff --git a/crates/rangular-aot/src/lib.rs b/crates/rangular-aot/src/lib.rs
index 53860e5..759674b 100644
--- a/crates/rangular-aot/src/lib.rs
+++ b/crates/rangular-aot/src/lib.rs
@@ -17,7 +17,7 @@ pub use print::tokens_to_rust_source;
 pub use rangular_expr;
 pub use rangular_host;
 pub use rangular_parser;
-pub use rangular_parser::{binding_ir, binding_ir_snapshot, IrBinding, IrNode};
+pub use rangular_parser::{IrBinding, IrNode, binding_ir, binding_ir_snapshot};
 
 /// Structural binding IR for `source` (shared with runtime parity).
 #[must_use]
diff --git a/crates/rangular-aot/src/lower.rs b/crates/rangular-aot/src/lower.rs
index f3b27a5..05b32f5 100644
--- a/crates/rangular-aot/src/lower.rs
+++ b/crates/rangular-aot/src/lower.rs
@@ -4,8 +4,8 @@ use proc_macro2::{Literal, Punct, Spacing, TokenStream, TokenTree};
 use quote::{format_ident, quote};
 use rangular_expr::Expr;
 use rangular_parser::{
-    collect_ng_templates, collect_projection_selects, has_default_projection, select_param_name,
-    template_outlet_ref, Attr, Element, ForBlock, IfBlock, Node, Projection, Template,
+    Attr, Element, ForBlock, IfBlock, Node, Projection, Template, collect_ng_templates,
+    collect_projection_selects, has_default_projection, select_param_name, template_outlet_ref,
 };
 
 use crate::error::{AotIssue, EmitResult, EmitTokens};
@@ -695,16 +695,12 @@ fn event_attr(name: &str, value: &TokenStream) -> TokenStream {
 }
 
 const fn sanitize_tag(tag: &str) -> &str {
-    if tag.is_empty() {
-        "div"
-    } else {
-        tag
-    }
+    if tag.is_empty() { "div" } else { tag }
 }
 
 #[cfg(test)]
 mod coverage_arms {
-    use super::{lower_one_attr, sanitize_tag, HoistState, Scope};
+    use super::{HoistState, Scope, lower_one_attr, sanitize_tag};
     use rangular_parser::{Attr, Span};
 
     #[test]
diff --git a/crates/rangular-aot/tests/host_cell.rs b/crates/rangular-aot/tests/host_cell.rs
index 82a7882..57da55d 100644
--- a/crates/rangular-aot/tests/host_cell.rs
+++ b/crates/rangular-aot/tests/host_cell.rs
@@ -4,7 +4,7 @@ use std::rc::Rc;
 use std::sync::Arc;
 
 use rangular_aot::HostCell;
-use rangular_expr::{parse, Expr, Host, PipeRegistry, Value};
+use rangular_expr::{Expr, Host, PipeRegistry, Value, parse};
 use rangular_host::{EventPayload, HostError, LoopScope};
 
 type ValueMap = HashMap<String, Value>;
@@ -125,10 +125,11 @@ fn host_cell_events_and_value_display_variants() {
     cell.emit_dom_event_call("onInput", &handler, "load", String::new());
     cell.emit_dom_event_call("onInput", &handler, "focus", "x".into());
 
-    assert!(cell
-        .eval_value(&Expr::Ident("$event".into()))
-        .as_event()
-        .is_some());
+    assert!(
+        cell.eval_value(&Expr::Ident("$event".into()))
+            .as_event()
+            .is_some()
+    );
 
     let host2 = MapHost::new();
     host2.values.borrow_mut().insert(
@@ -186,11 +187,13 @@ fn host_cell_scoped_bool_none_item_and_event_helpers() {
     let cell2 = HostCell::new(seed);
     let write = rangular_parser::banana_write_expr(&Expr::Ident("seed".into()));
     cell2.emit_dom_event_call("$bananaSet", &write, "click", "1,2".into());
-    assert!(values
-        .borrow()
-        .get("seed")
-        .and_then(Value::as_event)
-        .is_some());
+    assert!(
+        values
+            .borrow()
+            .get("seed")
+            .and_then(Value::as_event)
+            .is_some()
+    );
 }
 
 #[test]
diff --git a/crates/rangular-aot/tests/smoke.rs b/crates/rangular-aot/tests/smoke.rs
index bcadc58..c36f84e 100644
--- a/crates/rangular-aot/tests/smoke.rs
+++ b/crates/rangular-aot/tests/smoke.rs
@@ -144,7 +144,7 @@ fn hostcell_dom_event_passes_dollar_event_to_handler() {
     use std::rc::Rc;
 
     use rangular_aot::HostCell;
-    use rangular_expr::{parse, Host, Value};
+    use rangular_expr::{Host, Value, parse};
     use rangular_host::{EventPayload, HostError};
 
     struct CaptureHost {
@@ -233,10 +233,12 @@ fn lower_edge_templates() {
         "missing_outlet_view",
     );
     assert!(!unknown.ok());
-    assert!(unknown
-        .issues
-        .iter()
-        .any(|i| i.message.contains("unknown ngTemplateOutlet")));
+    assert!(
+        unknown
+            .issues
+            .iter()
+            .any(|i| i.message.contains("unknown ngTemplateOutlet"))
+    );
 }
 
 #[test]
diff --git a/crates/rangular-css/src/encapsulate.rs b/crates/rangular-css/src/encapsulate.rs
index 32902d7..647abdd 100644
--- a/crates/rangular-css/src/encapsulate.rs
+++ b/crates/rangular-css/src/encapsulate.rs
@@ -410,8 +410,8 @@ fn strip_comments(css: &str) -> String {
 #[cfg(test)]
 mod coverage_arms {
     use super::{
-        append_attr, flatten_block, flatten_host, flatten_selector, process_block, take_rule,
-        ScopeAttrs,
+        ScopeAttrs, append_attr, flatten_block, flatten_host, flatten_selector, process_block,
+        take_rule,
     };
 
     #[test]
diff --git a/crates/rangular-css/src/lib.rs b/crates/rangular-css/src/lib.rs
index 410c53e..ffa7c6b 100644
--- a/crates/rangular-css/src/lib.rs
+++ b/crates/rangular-css/src/lib.rs
@@ -6,7 +6,7 @@ mod encapsulate;
 mod error;
 mod globals;
 
-pub use encapsulate::{compile_scss, encapsulate, encapsulate_css, ScopeAttrs};
+pub use encapsulate::{ScopeAttrs, compile_scss, encapsulate, encapsulate_css};
 pub use error::{CssIssue, CssResult};
 pub use globals::is_global_selector;
 
diff --git a/crates/rangular-css/tests/encapsulate.rs b/crates/rangular-css/tests/encapsulate.rs
index bf890db..776379b 100644
--- a/crates/rangular-css/tests/encapsulate.rs
+++ b/crates/rangular-css/tests/encapsulate.rs
@@ -1,4 +1,4 @@
-use rangular_css::{compile_scss, encapsulate, encapsulate_css, ScopeAttrs};
+use rangular_css::{ScopeAttrs, compile_scss, encapsulate, encapsulate_css};
 use std::path::{Path, PathBuf};
 
 fn fixture_root() -> PathBuf {
@@ -180,9 +180,10 @@ fn encapsulate_keeps_container_and_has() {
     );
     assert!(out.ok(), "{:?}", out.issues);
     assert!(out.css.contains("@container (max-width: 20rem)"));
-    assert!(out
-        .css
-        .contains(".item-list[_ngcontent-r0]:has(.item-list__implicit)"));
+    assert!(
+        out.css
+            .contains(".item-list[_ngcontent-r0]:has(.item-list__implicit)")
+    );
     assert!(out.css.contains(".item-list__row[_ngcontent-r0]"));
 }
 
@@ -346,8 +347,10 @@ fn compile_scss_layer_font_and_host_descendants() {
 
     let empty_sel = encapsulate_css(".a,,.b { color: red; }", &scope());
     assert!(!empty_sel.ok());
-    assert!(empty_sel
-        .issues
-        .iter()
-        .any(|i| i.message.contains("empty selector")));
+    assert!(
+        empty_sel
+            .issues
+            .iter()
+            .any(|i| i.message.contains("empty selector"))
+    );
 }
diff --git a/crates/rangular-expr/src/lib.rs b/crates/rangular-expr/src/lib.rs
index 4bc6b76..294e091 100644
--- a/crates/rangular-expr/src/lib.rs
+++ b/crates/rangular-expr/src/lib.rs
@@ -7,7 +7,7 @@ mod parse_issue;
 mod pipe;
 
 pub use ast::{BinOp, Expr, Literal, UnOp};
-pub use eval::{eval, eval_with_pipes, EvalError};
+pub use eval::{EvalError, eval, eval_with_pipes};
 pub use parse::parse;
 pub use parse_issue::{IssueSeverity, ParseIssue, ParseResult};
 pub use pipe::{PipeFn, PipeRegistry};
diff --git a/crates/rangular-expr/tests/eval.rs b/crates/rangular-expr/tests/eval.rs
index 9b36e44..971487e 100644
--- a/crates/rangular-expr/tests/eval.rs
+++ b/crates/rangular-expr/tests/eval.rs
@@ -1,4 +1,4 @@
-use rangular_expr::{eval, parse, BinOp, Expr, Host, Literal, Value};
+use rangular_expr::{BinOp, Expr, Host, Literal, Value, eval, parse};
 use rangular_host::HostError;
 
 struct Counter;
@@ -199,38 +199,46 @@ fn parse_error_and_feature_paths() {
     assert!(ternary.issues.iter().any(|i| i.message.contains("ternary")));
 
     let bad_ternary = parse("flag ? 1");
-    assert!(bad_ternary
-        .issues
-        .iter()
-        .any(|i| i.message.contains("expected ':'")));
+    assert!(
+        bad_ternary
+            .issues
+            .iter()
+            .any(|i| i.message.contains("expected ':'"))
+    );
 
     let grouped = parse("(n == 2)");
     assert!(grouped.expr.is_some());
     assert_eq!(grouped.issues.len(), 0);
 
     let unclosed_paren = parse("(n");
-    assert!(unclosed_paren
-        .issues
-        .iter()
-        .any(|i| i.message.contains("unclosed")));
+    assert!(
+        unclosed_paren
+            .issues
+            .iter()
+            .any(|i| i.message.contains("unclosed"))
+    );
 
     let call_args = parse("fn(a, b)");
     assert!(matches!(call_args.expr, Some(Expr::Call { .. })));
 
     let unclosed_call = parse("fn(a");
-    assert!(unclosed_call
-        .issues
-        .iter()
-        .any(|i| i.message.contains("unclosed")));
+    assert!(
+        unclosed_call
+            .issues
+            .iter()
+            .any(|i| i.message.contains("unclosed"))
+    );
 
     let escaped = parse(r#""a\"b""#);
     assert!(escaped.expr.is_some());
 
     let unclosed_str = parse("'abc");
-    assert!(unclosed_str
-        .issues
-        .iter()
-        .any(|i| i.message.contains("unclosed string")));
+    assert!(
+        unclosed_str
+            .issues
+            .iter()
+            .any(|i| i.message.contains("unclosed string"))
+    );
 
     let bad_ident = parse("1n");
     assert!(bad_ident.expr.is_some() || !bad_ident.issues.is_empty());
diff --git a/crates/rangular-host/src/lib.rs b/crates/rangular-host/src/lib.rs
index e780cea..853527a 100644
--- a/crates/rangular-host/src/lib.rs
+++ b/crates/rangular-host/src/lib.rs
@@ -9,7 +9,7 @@ mod value;
 
 pub use error::HostError;
 pub use event::EventPayload;
-pub use for_scope::{for_implicit_value, LoopScope};
+pub use for_scope::{LoopScope, for_implicit_value};
 pub use host::Host;
 pub use regex::Regex;
 pub use validate::{
diff --git a/crates/rangular-host/tests/for_scope.rs b/crates/rangular-host/tests/for_scope.rs
index 49db690..ee0a9d8 100644
--- a/crates/rangular-host/tests/for_scope.rs
+++ b/crates/rangular-host/tests/for_scope.rs
@@ -1,4 +1,4 @@
-use rangular_host::{for_implicit_value, Value};
+use rangular_host::{Value, for_implicit_value};
 
 #[test]
 fn for_implicit_index_and_count() {
diff --git a/crates/rangular-host/tests/seed_bar.rs b/crates/rangular-host/tests/seed_bar.rs
index b9df81d..7b819aa 100644
--- a/crates/rangular-host/tests/seed_bar.rs
+++ b/crates/rangular-host/tests/seed_bar.rs
@@ -1,4 +1,4 @@
-use rangular_expr::{eval, parse, Expr, Host, Value};
+use rangular_expr::{Expr, Host, Value, eval, parse};
 use rangular_host::HostError;
 
 struct SeedBarHost {
@@ -87,10 +87,11 @@ fn seed_bar_handlers() {
     assert_eq!(host.last_call.as_deref(), Some("onGenerate([])"));
 
     eval(&must_parse("seedChange($event)"), &mut host).unwrap();
-    assert!(host
-        .last_call
-        .as_deref()
-        .is_some_and(|c| c.starts_with("seedChange(")));
+    assert!(
+        host.last_call
+            .as_deref()
+            .is_some_and(|c| c.starts_with("seedChange("))
+    );
 }
 
 #[test]
diff --git a/crates/rangular-host/tests/validate.rs b/crates/rangular-host/tests/validate.rs
index 1d1ed60..b8c3a5c 100644
--- a/crates/rangular-host/tests/validate.rs
+++ b/crates/rangular-host/tests/validate.rs
@@ -1,6 +1,6 @@
 use rangular_host::{
-    first_error, max_length, max_length_value, min_length, min_length_value, pattern,
-    pattern_value, required, required_value, show_when_dirty, Regex, Value,
+    Regex, Value, first_error, max_length, max_length_value, min_length, min_length_value, pattern,
+    pattern_value, required, required_value, show_when_dirty,
 };
 
 #[test]
diff --git a/crates/rangular-host/tests/value.rs b/crates/rangular-host/tests/value.rs
index e1d9c86..d03f931 100644
--- a/crates/rangular-host/tests/value.rs
+++ b/crates/rangular-host/tests/value.rs
@@ -15,10 +15,12 @@ fn is_truthy_covers_variants() {
     assert!(Value::from(EventPayload::Error).is_truthy());
     assert!(Value::from(EventPayload::Load).is_truthy());
     assert!(Value::from(EventPayload::Input { value: "a".into() }).is_truthy());
-    assert!(!Value::from(EventPayload::Input {
-        value: String::new()
-    })
-    .is_truthy());
+    assert!(
+        !Value::from(EventPayload::Input {
+            value: String::new()
+        })
+        .is_truthy()
+    );
     assert!(Value::from(EventPayload::Custom(Box::new(Value::Bool(true)))).is_truthy());
     assert!(!Value::from(EventPayload::Custom(Box::new(Value::Unit))).is_truthy());
 }
@@ -87,9 +89,11 @@ fn event_payload_labels_and_from_dom() {
     );
     assert_eq!(EventPayload::Error.demo_label(), "Error");
     assert_eq!(EventPayload::Load.demo_label(), "Load");
-    assert!(EventPayload::Custom(Box::new(Value::Unit))
-        .demo_label()
-        .starts_with("Custom("));
+    assert!(
+        EventPayload::Custom(Box::new(Value::Unit))
+            .demo_label()
+            .starts_with("Custom(")
+    );
     assert_eq!(EventPayload::Click { x: 0, y: 0 }.kind_label(), "click");
     assert_eq!(
         EventPayload::Input {
diff --git a/crates/rangular-macros/src/lib.rs b/crates/rangular-macros/src/lib.rs
index 1cfff02..b9a901c 100644
--- a/crates/rangular-macros/src/lib.rs
+++ b/crates/rangular-macros/src/lib.rs
@@ -10,7 +10,7 @@ use std::path::PathBuf;
 
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::{parse_macro_input, LitStr};
+use syn::{LitStr, parse_macro_input};
 
 #[proc_macro]
 pub fn rangular_template(input: TokenStream) -> TokenStream {
@@ -56,7 +56,7 @@ fn default_fn_name(path: &str) -> String {
 
 #[cfg(test)]
 mod tests {
-    use super::{default_fn_name, TemplateInput};
+    use super::{TemplateInput, default_fn_name};
     use syn::parse_str;
 
     fn resolve_fn_name(input: &TemplateInput) -> String {
diff --git a/crates/rangular-parser/src/diag.rs b/crates/rangular-parser/src/diag.rs
index f7a9624..77c9457 100644
--- a/crates/rangular-parser/src/diag.rs
+++ b/crates/rangular-parser/src/diag.rs
@@ -1,4 +1,4 @@
-use crate::span::{line_col, Span};
+use crate::span::{Span, line_col};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Severity {
diff --git a/crates/rangular-parser/src/lib.rs b/crates/rangular-parser/src/lib.rs
index ce53859..3a2cbf0 100644
--- a/crates/rangular-parser/src/lib.rs
+++ b/crates/rangular-parser/src/lib.rs
@@ -9,20 +9,20 @@ mod projection;
 mod span;
 
 pub use ast::{Attr, Element, ForBlock, IfBlock, NgTemplate, Node, Projection, Template};
-pub use banana::{banana_event_name, banana_set_target, banana_write_expr, BANANA_SET_CALLEE};
-pub use component_io::{builtin_tag_io, classify_bindings, TagIo};
+pub use banana::{BANANA_SET_CALLEE, banana_event_name, banana_set_target, banana_write_expr};
+pub use component_io::{TagIo, builtin_tag_io, classify_bindings};
 pub use diag::{Diagnostic, Severity};
 pub use expr::{BinOp, Expr, Literal, UnOp};
 pub use ir::{
-    event_handler_name, from_template as binding_ir, snapshot as binding_ir_snapshot, IrBinding,
-    IrNode,
+    IrBinding, IrNode, event_handler_name, from_template as binding_ir,
+    snapshot as binding_ir_snapshot,
 };
-pub use parser::{parse, Parsed};
+pub use parser::{Parsed, parse};
 pub use projection::{
     collect_ng_templates, collect_projection_selects, has_default_projection, is_outlet_container,
     is_projection_tag, matches_select, select_param_name, template_outlet_ref,
 };
-pub use span::{line_col, Span};
+pub use span::{Span, line_col};
 
 pub const VERSION: &str = env!("CARGO_PKG_VERSION");
 
diff --git a/crates/rangular-parser/src/parser.rs b/crates/rangular-parser/src/parser.rs
index 17416a1..7310cf4 100644
--- a/crates/rangular-parser/src/parser.rs
+++ b/crates/rangular-parser/src/parser.rs
@@ -1,9 +1,9 @@
 use crate::ast::{Attr, Element, ForBlock, IfBlock, NgTemplate, Node, Projection, Template};
 use crate::banana::{banana_event_name, banana_write_expr};
 use crate::diag::Diagnostic;
-use crate::expr::{parse_into, Expr};
+use crate::expr::{Expr, parse_into};
 use crate::projection::is_projection_tag;
-use crate::span::{pos, Span};
+use crate::span::{Span, pos};
 
 const VOID: &[&str] = &[
     "area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta", "param", "source",
diff --git a/crates/rangular-parser/tests/corpus.rs b/crates/rangular-parser/tests/corpus.rs
index 2edfa12..b58d41e 100644
--- a/crates/rangular-parser/tests/corpus.rs
+++ b/crates/rangular-parser/tests/corpus.rs
@@ -1,4 +1,4 @@
-use rangular_parser::{parse, Node};
+use rangular_parser::{Node, parse};
 use std::path::{Path, PathBuf};
 
 fn fixture_root() -> PathBuf {
@@ -78,11 +78,13 @@ fn asset_icon_has_nested_if() {
     let src = std::fs::read_to_string(path).unwrap();
     let parsed = parse(&src, "asset-icon.html");
     assert!(parsed.ok());
-    assert!(parsed
-        .template
-        .nodes
-        .iter()
-        .any(|n| matches!(n, Node::If(_))));
+    assert!(
+        parsed
+            .template
+            .nodes
+            .iter()
+            .any(|n| matches!(n, Node::If(_)))
+    );
 }
 
 #[test]
@@ -179,10 +181,12 @@ fn template_outlet_parses_ref() {
             _ => None,
         })
         .expect("section");
-    assert!(section
-        .children
-        .iter()
-        .any(|c| { matches!(c, Node::NgTemplate(t) if t.name == "card") }));
+    assert!(
+        section
+            .children
+            .iter()
+            .any(|c| { matches!(c, Node::NgTemplate(t) if t.name == "card") })
+    );
 }
 
 #[test]
@@ -204,8 +208,10 @@ fn garbage_input_never_panics() {
 fn unknown_directive_warns_not_panics() {
     let parsed = parse(r#"<div *unknown="yes"></div>"#, "warn.html");
     assert!(parsed.ok());
-    assert!(parsed
-        .diagnostics
-        .iter()
-        .any(|d| d.code == "RANG101" && d.message.contains("unknown structural directive")));
+    assert!(
+        parsed
+            .diagnostics
+            .iter()
+            .any(|d| d.code == "RANG101" && d.message.contains("unknown structural directive"))
+    );
 }
diff --git a/crates/rangular-parser/tests/edge_cases.rs b/crates/rangular-parser/tests/edge_cases.rs
index d432bae..c4119ff 100644
--- a/crates/rangular-parser/tests/edge_cases.rs
+++ b/crates/rangular-parser/tests/edge_cases.rs
@@ -1,21 +1,25 @@
 use rangular_parser::{
-    banana_event_name, banana_set_target, banana_write_expr, collect_ng_templates,
-    collect_projection_selects, has_default_projection, is_outlet_container, is_projection_tag,
-    matches_select, parse, select_param_name, template_outlet_ref, Attr, Expr, Node,
+    Attr, Expr, Node, banana_event_name, banana_set_target, banana_write_expr,
+    collect_ng_templates, collect_projection_selects, has_default_projection, is_outlet_container,
+    is_projection_tag, matches_select, parse, select_param_name, template_outlet_ref,
 };
 
 #[test]
 fn unexpected_else_and_closing_tag() {
     let lone_else = parse("@else { hi }", "t.html");
-    assert!(lone_else
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("unexpected @else")));
+    assert!(
+        lone_else
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("unexpected @else"))
+    );
     let close = parse("</div>", "t.html");
-    assert!(close
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("unexpected closing tag")));
+    assert!(
+        close
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("unexpected closing tag"))
+    );
 }
 
 #[test]
@@ -28,10 +32,11 @@ fn comments_and_unclosed_comment() {
     ));
     let bad = parse("<!-- open", "t.html");
     assert!(!bad.ok());
-    assert!(bad
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("unclosed comment")));
+    assert!(
+        bad.diagnostics
+            .iter()
+            .any(|d| d.message.contains("unclosed comment"))
+    );
 }
 
 #[test]
@@ -58,10 +63,12 @@ fn projection_and_ng_template() {
 
     let missing = parse("<ng-template><p>x</p></ng-template>", "t.html");
     assert!(!missing.ok());
-    assert!(missing
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("ng-template requires")));
+    assert!(
+        missing
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("ng-template requires"))
+    );
 }
 
 #[test]
@@ -78,10 +85,12 @@ fn structural_ng_if_for_and_unknown() {
     assert!(matches!(nfor.template.nodes.first(), Some(Node::For(_))));
 
     let unknown = parse("<p *ngSwitch=\"mode\">x</p>", "t.html");
-    assert!(unknown
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("unknown structural")));
+    assert!(
+        unknown
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("unknown structural"))
+    );
 }
 
 #[test]
@@ -103,16 +112,20 @@ fn control_flow_blocks_and_errors() {
     assert!(tracked.ok(), "{:?}", tracked.diagnostics);
 
     let bad_if = parse("@if flag { x }", "t.html");
-    assert!(bad_if
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected '(' after @if")));
+    assert!(
+        bad_if
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected '(' after @if"))
+    );
 
     let bad_for = parse("@for (item items) { <span>x</span> }", "t.html");
-    assert!(bad_for
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected 'of'")));
+    assert!(
+        bad_for
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected 'of'"))
+    );
 }
 
 #[test]
@@ -172,18 +185,22 @@ fn matches_select_variants_and_outlet() {
 #[test]
 fn attribute_error_paths_and_mismatched_close() {
     let unclosed = parse("{{ label", "t.html");
-    assert!(unclosed
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("unclosed interpolation")));
+    assert!(
+        unclosed
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("unclosed interpolation"))
+    );
 
     let mismatch = parse("<div><span></div>", "t.html");
-    assert!(mismatch
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("unexpected closing tag")
-            || d.message.contains("does not match")
-            || d.message.contains("unexpected end")));
+    assert!(
+        mismatch
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("unexpected closing tag")
+                || d.message.contains("does not match")
+                || d.message.contains("unexpected end"))
+    );
 
     let flag = parse("<input disabled />", "t.html");
     assert!(flag.ok(), "{:?}", flag.diagnostics);
@@ -202,25 +219,31 @@ fn attribute_error_paths_and_mismatched_close() {
     assert!(escaped.ok(), "{:?}", escaped.diagnostics);
 
     let unquoted = parse("<div [title]=foo></div>", "t.html");
-    assert!(unquoted
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected quoted")));
+    assert!(
+        unquoted
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected quoted"))
+    );
 }
 
 #[test]
 fn for_brace_and_iterable_error_paths() {
     let no_paren = parse("@for item of items { <span>x</span> }", "t.html");
-    assert!(no_paren
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected '(' after @for")));
+    assert!(
+        no_paren
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected '(' after @for"))
+    );
 
     let empty_iter = parse("@for (let item of ) { <span>x</span> }", "t.html");
-    assert!(empty_iter
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected iterable")));
+    assert!(
+        empty_iter
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected iterable"))
+    );
 
     let no_track = parse("@for (let item of items; ) { <span>x</span> }", "t.html");
     assert!(
@@ -240,16 +263,20 @@ fn for_brace_and_iterable_error_paths() {
     }
 
     let missing_brace = parse("@if (flag) x", "t.html");
-    assert!(missing_brace
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected '{'")));
+    assert!(
+        missing_brace
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected '{'"))
+    );
 
     let for_missing_brace = parse("@for (let i of items) x", "t.html");
-    assert!(for_missing_brace
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected '{'")));
+    assert!(
+        for_missing_brace
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected '{'"))
+    );
 }
 
 #[test]
@@ -379,10 +406,12 @@ fn expr_layer_error_and_warning_via_interpolation() {
 #[test]
 fn parser_malformed_attrs_quotes_and_text_boundaries() {
     let unclosed = parse(r#"<div title="open></div>"#, "t.html");
-    assert!(unclosed
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("unclosed")));
+    assert!(
+        unclosed
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("unclosed"))
+    );
 
     let text_for = parse(
         "hello @for (let item of items) { <span>{{item}}</span> }",
@@ -406,10 +435,13 @@ fn parser_malformed_attrs_quotes_and_text_boundaries() {
     assert!(star_attr.ok() || star_attr.diagnostics.iter().any(|_| true));
 
     let mismatch = parse("<section></div>", "t.html");
-    assert!(mismatch
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("unexpected closing") || d.message.contains("does not match")));
+    assert!(
+        mismatch
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("unexpected closing")
+                || d.message.contains("does not match"))
+    );
 }
 
 #[test]
@@ -439,7 +471,7 @@ fn span_line_col_counts_newlines() {
 
 #[test]
 fn binding_ir_comment_outlet_and_handler_names() {
-    use rangular_parser::{binding_ir, binding_ir_snapshot, event_handler_name, IrNode};
+    use rangular_parser::{IrNode, binding_ir, binding_ir_snapshot, event_handler_name};
 
     let with_comment = parse("<!-- c --><p>x</p>", "t.html");
     let ir = binding_ir(&with_comment.template);
@@ -452,9 +484,11 @@ fn binding_ir_comment_outlet_and_handler_names() {
         "t.html",
     );
     let outlet_ir = binding_ir(&outlet.template);
-    assert!(outlet_ir
-        .iter()
-        .any(|n| matches!(n, IrNode::TemplateOutlet { .. })));
+    assert!(
+        outlet_ir
+            .iter()
+            .any(|n| matches!(n, IrNode::TemplateOutlet { .. }))
+    );
 
     assert_eq!(
         event_handler_name(&Expr::Call {
@@ -472,7 +506,7 @@ fn binding_ir_comment_outlet_and_handler_names() {
 
 #[test]
 fn classify_bindings_marks_registered_outputs() {
-    use rangular_parser::{classify_bindings, Attr, TagIo};
+    use rangular_parser::{Attr, TagIo, classify_bindings};
     use std::collections::HashMap;
 
     let mut parsed = parse(
@@ -488,50 +522,63 @@ fn classify_bindings_marks_registered_outputs() {
     let Some(Node::Element(el)) = parsed.template.nodes.first() else {
         panic!("expected element");
     };
-    assert!(el
-        .attrs
-        .iter()
-        .any(|a| matches!(a, Attr::Output { name, .. } if name == "muteToggle")));
+    assert!(
+        el.attrs
+            .iter()
+            .any(|a| matches!(a, Attr::Output { name, .. } if name == "muteToggle"))
+    );
 }
 
 #[test]
 fn banana_event_paren_and_for_ident_edges() {
     // Terminate bananas on `>` / `/` so the attr loop advances (no hang).
     let banana_paren = parse(r"<input [(value/>", "t.html");
-    assert!(banana_paren
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected ')' in two-way")));
+    assert!(
+        banana_paren
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected ')' in two-way"))
+    );
 
     let banana_bracket = parse(r"<input [(value)>", "t.html");
-    assert!(banana_bracket
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected ']' in two-way")));
+    assert!(
+        banana_bracket
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected ']' in two-way"))
+    );
 
     let banana_quote = parse(r"<input [(value)]=seed />", "t.html");
-    assert!(banana_quote
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected quoted")));
+    assert!(
+        banana_quote
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected quoted"))
+    );
 
     let banana_warn = parse(r#"<input [(value)]="foo()" />"#, "t.html");
-    assert!(banana_warn
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("two-way binding target")));
+    assert!(
+        banana_warn
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("two-way binding target"))
+    );
 
     let event_paren = parse(r"<button (click/>", "t.html");
-    assert!(event_paren
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected ')'")));
+    assert!(
+        event_paren
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected ')'"))
+    );
 
     let bad_ident = parse("@for (let 1 of items) { x }", "t.html");
-    assert!(bad_ident
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("expected identifier")));
+    assert!(
+        bad_ident
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("expected identifier"))
+    );
 
     let nested_paren = parse("@if ((a)) { x }", "t.html");
     assert!(nested_paren.ok(), "{:?}", nested_paren.diagnostics);
@@ -539,21 +586,25 @@ fn banana_event_paren_and_for_ident_edges() {
     assert!(call_paren.ok(), "{:?}", call_paren.diagnostics);
 
     let braced_else = parse("@if (x) { @else }", "t.html");
-    assert!(braced_else
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("unexpected @else")));
+    assert!(
+        braced_else
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("unexpected @else"))
+    );
 
     let mismatch = parse("<p>hi</div>", "t.html");
-    assert!(mismatch
-        .diagnostics
-        .iter()
-        .any(|d| d.message.contains("does not match") || d.message.contains("closing")));
+    assert!(
+        mismatch
+            .diagnostics
+            .iter()
+            .any(|d| d.message.contains("does not match") || d.message.contains("closing"))
+    );
 }
 
 #[test]
 fn binding_ir_skips_non_ident_outlet_and_classify_passthrough() {
-    use rangular_parser::{binding_ir, classify_bindings, Attr, IrNode, TagIo};
+    use rangular_parser::{Attr, IrNode, TagIo, binding_ir, classify_bindings};
     use std::collections::HashMap;
 
     let outlet = parse(r#"<div [ngTemplateOutlet]="foo()"></div>"#, "t.html");
@@ -573,20 +624,24 @@ fn binding_ir_skips_non_ident_outlet_and_classify_passthrough() {
     let Some(Node::Element(el)) = parsed.template.nodes.first() else {
         panic!("expected element");
     };
-    assert!(el
-        .attrs
-        .iter()
-        .any(|a| matches!(a, Attr::Input { name, .. } if name == "label")));
-    assert!(el
-        .attrs
-        .iter()
-        .any(|a| matches!(a, Attr::Property { name, .. } if name == "extra")));
-    assert!(el
-        .attrs
-        .iter()
-        .any(|a| matches!(a, Attr::Output { name, .. } if name == "muteToggle")));
-    assert!(el
-        .attrs
-        .iter()
-        .any(|a| matches!(a, Attr::Event { name, .. } if name == "click")));
+    assert!(
+        el.attrs
+            .iter()
+            .any(|a| matches!(a, Attr::Input { name, .. } if name == "label"))
+    );
+    assert!(
+        el.attrs
+            .iter()
+            .any(|a| matches!(a, Attr::Property { name, .. } if name == "extra"))
+    );
+    assert!(
+        el.attrs
+            .iter()
+            .any(|a| matches!(a, Attr::Output { name, .. } if name == "muteToggle"))
+    );
+    assert!(
+        el.attrs
+            .iter()
+            .any(|a| matches!(a, Attr::Event { name, .. } if name == "click"))
+    );
 }
diff --git a/crates/rangular-runtime/src/lib.rs b/crates/rangular-runtime/src/lib.rs
index 043841e..4576370 100644
--- a/crates/rangular-runtime/src/lib.rs
+++ b/crates/rangular-runtime/src/lib.rs
@@ -11,7 +11,7 @@ pub use error::{RenderResult, RuntimeIssue};
 pub use rangular_expr;
 pub use rangular_host;
 pub use rangular_parser;
-pub use rangular_parser::{binding_ir, binding_ir_snapshot, IrBinding, IrNode};
+pub use rangular_parser::{IrBinding, IrNode, binding_ir, binding_ir_snapshot};
 pub use render::{
     interpret, interpret_with_pipes, interpret_with_slot, interpret_with_slot_and_pipes,
     interpret_with_slots, interpret_with_slots_and_pipes, render, render_with_slot,
diff --git a/crates/rangular-runtime/src/render.rs b/crates/rangular-runtime/src/render.rs
index c8adced..dc113cf 100644
--- a/crates/rangular-runtime/src/render.rs
+++ b/crates/rangular-runtime/src/render.rs
@@ -1,10 +1,11 @@
 use std::collections::HashMap;
 
-use rangular_expr::{eval_with_pipes, Expr, PipeRegistry};
-use rangular_host::{for_implicit_value, Host, Value};
+use rangular_expr::{Expr, PipeRegistry, eval_with_pipes};
+use rangular_host::{Host, Value, for_implicit_value};
 use rangular_parser::{
-    builtin_tag_io, classify_bindings, collect_ng_templates, collect_projection_selects, parse,
-    template_outlet_ref, Attr, Diagnostic, Element, ForBlock, IfBlock, Node, Severity, Template,
+    Attr, Diagnostic, Element, ForBlock, IfBlock, Node, Severity, Template, builtin_tag_io,
+    classify_bindings, collect_ng_templates, collect_projection_selects, parse,
+    template_outlet_ref,
 };
 
 use crate::error::{RenderResult, RuntimeIssue};
@@ -401,9 +402,5 @@ fn display_value(value: &Value) -> String {
 }
 
 fn bool_str(b: bool) -> String {
-    if b {
-        "true".into()
-    } else {
-        "false".into()
-    }
+    if b { "true".into() } else { "false".into() }
 }
diff --git a/crates/rangular-runtime/tests/parity.rs b/crates/rangular-runtime/tests/parity.rs
index 4ac46ec..3611b16 100644
--- a/crates/rangular-runtime/tests/parity.rs
+++ b/crates/rangular-runtime/tests/parity.rs
@@ -690,7 +690,7 @@ fn field_required_host_validation() {
 
 #[test]
 fn field_validators_multi_field_host() {
-    use rangular_host::{first_error, min_length, pattern, required, Regex};
+    use rangular_host::{Regex, first_error, min_length, pattern, required};
 
     struct FieldValidatorsHost {
         name: String,
diff --git a/crates/rangular-runtime/tests/render_api.rs b/crates/rangular-runtime/tests/render_api.rs
index 0abcfe2..7bddd7c 100644
--- a/crates/rangular-runtime/tests/render_api.rs
+++ b/crates/rangular-runtime/tests/render_api.rs
@@ -1,8 +1,8 @@
 use rangular_expr::{Host, Value};
 use rangular_host::{EventPayload, HostError};
 use rangular_runtime::{
-    interpret, interpret_with_slot, interpret_with_slots, render, render_with_slot,
-    render_with_slots, ProjectionBag, VNode,
+    ProjectionBag, VNode, interpret, interpret_with_slot, interpret_with_slots, render,
+    render_with_slot, render_with_slots,
 };
 
 struct DemoHost;
diff --git a/crates/rangular/src/lib.rs b/crates/rangular/src/lib.rs
index cb11d00..44af52c 100644
--- a/crates/rangular/src/lib.rs
+++ b/crates/rangular/src/lib.rs
@@ -16,8 +16,8 @@ pub use rangular_parser as parser;
 pub use rangular_runtime as runtime;
 
 pub use registry::{
-    ComponentEntry, Registry, APP_ASSET_ICON, APP_CHROME_HEADER, APP_COLOR_FIELD, APP_IO_CHILD,
-    APP_ITEM_LIST,
+    APP_ASSET_ICON, APP_CHROME_HEADER, APP_COLOR_FIELD, APP_IO_CHILD, APP_ITEM_LIST,
+    ComponentEntry, Registry,
 };
 
 /// Workspace package version.
diff --git a/crates/rangular/src/registry.rs b/crates/rangular/src/registry.rs
index 8de37ac..e0d3ba9 100644
--- a/crates/rangular/src/registry.rs
+++ b/crates/rangular/src/registry.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use rangular_expr::{PipeFn, PipeRegistry};
-use rangular_parser::{builtin_tag_io, TagIo};
+use rangular_parser::{TagIo, builtin_tag_io};
 
 /// Example component tags aligned with `tests/fixtures/components/`.
 pub const APP_COLOR_FIELD: &str = "app-color-field";
@@ -157,7 +157,7 @@ impl Registry {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rangular_expr::{eval_with_pipes, parse, Host, Value};
+    use rangular_expr::{Host, Value, eval_with_pipes, parse};
     use rangular_host::HostError;
 
     struct LabelHost;
diff --git a/demo-leptos/Cargo.toml b/demo-leptos/Cargo.toml
index b9039c0..1e8a491 100644
--- a/demo-leptos/Cargo.toml
+++ b/demo-leptos/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rangular-demo"
 description = "Browser demo for rangular (Leptos CSR + colocated panels)"
 version = "1.0.2"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 publish = false
 
diff --git a/demo-leptos/src/components/field_required/field_required.rs b/demo-leptos/src/components/field_required/field_required.rs
index 0080fc6..e32646a 100644
--- a/demo-leptos/src/components/field_required/field_required.rs
+++ b/demo-leptos/src/components/field_required/field_required.rs
@@ -1,6 +1,6 @@
 use leptos::prelude::*;
 use rangular_aot::HostCell;
-use rangular_host::{required, Host, HostError, Value};
+use rangular_host::{Host, HostError, Value, required};
 
 include!(concat!(env!("OUT_DIR"), "/rangular/field_required_view.rs"));
 
diff --git a/demo-leptos/src/components/field_validators/field_validators.rs b/demo-leptos/src/components/field_validators/field_validators.rs
index 5d6ceb8..2031bd3 100644
--- a/demo-leptos/src/components/field_validators/field_validators.rs
+++ b/demo-leptos/src/components/field_validators/field_validators.rs
@@ -1,10 +1,11 @@
 use leptos::prelude::*;
 use rangular_aot::HostCell;
-use rangular_host::{
-    first_error, min_length, pattern, required, Host, HostError, Regex, Value,
-};
+use rangular_host::{Host, HostError, Regex, Value, first_error, min_length, pattern, required};
 
-include!(concat!(env!("OUT_DIR"), "/rangular/field_validators_view.rs"));
+include!(concat!(
+    env!("OUT_DIR"),
+    "/rangular/field_validators_view.rs"
+));
 
 #[component]
 pub fn FieldValidatorsPanel(applied_seed: RwSignal<String>) -> impl IntoView {
diff --git a/demo-leptos/src/components/seed_bar/seed_bar.rs b/demo-leptos/src/components/seed_bar/seed_bar.rs
index 9d3a351..5d2dda8 100644
--- a/demo-leptos/src/components/seed_bar/seed_bar.rs
+++ b/demo-leptos/src/components/seed_bar/seed_bar.rs
@@ -42,10 +42,10 @@ impl Host for SeedBarHost {
     }
 
     fn set(&mut self, name: &str, value: Value) -> Result<(), HostError> {
-        if name == "seed" {
-            if let Some(s) = value.as_str() {
-                self.seed.set(s.to_owned());
-            }
+        if name == "seed"
+            && let Some(s) = value.as_str()
+        {
+            self.seed.set(s.to_owned());
         }
         Ok(())
     }
diff --git a/demo-leptos/src/components/two_way/two_way.rs b/demo-leptos/src/components/two_way/two_way.rs
index d046836..110c26f 100644
--- a/demo-leptos/src/components/two_way/two_way.rs
+++ b/demo-leptos/src/components/two_way/two_way.rs
@@ -29,10 +29,10 @@ impl Host for TwoWayHost {
     }
 
     fn set(&mut self, name: &str, value: Value) -> Result<(), HostError> {
-        if name == "seed" {
-            if let Some(s) = value.as_str() {
-                self.seed.set(s.to_owned());
-            }
+        if name == "seed"
+            && let Some(s) = value.as_str()
+        {
+            self.seed.set(s.to_owned());
         }
         Ok(())
     }
diff --git a/demo-leptos/src/showcase/bus.rs b/demo-leptos/src/showcase/bus.rs
index dd43266..bc3f79f 100644
--- a/demo-leptos/src/showcase/bus.rs
+++ b/demo-leptos/src/showcase/bus.rs
@@ -62,10 +62,10 @@ impl ShowcaseBus {
         } else {
             "collapsed"
         };
-        if let Some(window) = web_sys::window() {
-            if let Ok(Some(storage)) = window.local_storage() {
-                let _ = storage.set_item(STORAGE_KEY, value);
-            }
+        if let Some(window) = web_sys::window()
+            && let Ok(Some(storage)) = window.local_storage()
+        {
+            let _ = storage.set_item(STORAGE_KEY, value);
         }
     }
 
@@ -98,17 +98,17 @@ impl ShowcaseBus {
 
 fn default_expanded() -> bool {
     if let Some(window) = web_sys::window() {
-        if let Ok(Some(storage)) = window.local_storage() {
-            if let Ok(Some(value)) = storage.get_item(STORAGE_KEY) {
-                return value == "expanded";
-            }
+        if let Ok(Some(storage)) = window.local_storage()
+            && let Ok(Some(value)) = storage.get_item(STORAGE_KEY)
+        {
+            return value == "expanded";
         }
-        if let Ok(width) = window.inner_width() {
-            if let Some(w) = width.as_f64() {
-                // First visit on narrow viewports: start collapsed so the demo stays usable.
-                if w <= 1024.0 {
-                    return false;
-                }
+        if let Ok(width) = window.inner_width()
+            && let Some(w) = width.as_f64()
+        {
+            // First visit on narrow viewports: start collapsed so the demo stays usable.
+            if w <= 1024.0 {
+                return false;
             }
         }
     }
diff --git a/demo-leptos/src/showcase/mod.rs b/demo-leptos/src/showcase/mod.rs
index 871df93..dbae94e 100644
--- a/demo-leptos/src/showcase/mod.rs
+++ b/demo-leptos/src/showcase/mod.rs
@@ -13,8 +13,8 @@ use kode_leptos::{CodeEditor, EditorHandle, Marker, MarkerSeverity, Position, Th
 use leptos::prelude::*;
 
 use self::sources::{
-    file_extension, file_stem, group_label_for_stem, is_io_child_html, source_for, truncate_middle,
-    ShowcaseFile, ShowcaseLang, TAB_STEM_MAX, TRINITY_LEN,
+    ShowcaseFile, ShowcaseLang, TAB_STEM_MAX, TRINITY_LEN, file_extension, file_stem,
+    group_label_for_stem, is_io_child_html, source_for, truncate_middle,
 };
 
 const CONTENT_FADE_MS: u32 = 120;
diff --git a/demo-leptos/src/showcase/observer.rs b/demo-leptos/src/showcase/observer.rs
index e10373a..2d2fca6 100644
--- a/demo-leptos/src/showcase/observer.rs
+++ b/demo-leptos/src/showcase/observer.rs
@@ -1,12 +1,12 @@
 //! Hover and hash sync for the active demo panel (no scroll spy).
 
 use leptos::prelude::*;
-use wasm_bindgen::closure::Closure;
 use wasm_bindgen::JsCast;
+use wasm_bindgen::closure::Closure;
 use web_sys::{Document, Element, Event, Window};
 
-use super::sources::SHOWCASE;
 use super::ShowcaseBus;
+use super::sources::SHOWCASE;
 
 pub fn watch_panels(bus: ShowcaseBus) {
     Effect::new(move |_| {
@@ -28,10 +28,10 @@ pub fn watch_panels(bus: ShowcaseBus) {
 
 fn bind_hash_change(window: &Window, bus: ShowcaseBus) {
     let on_hash = Closure::wrap(Box::new(move || {
-        if let Some(window) = web_sys::window() {
-            if let Ok(hash) = window.location().hash() {
-                apply_hash(&hash, bus);
-            }
+        if let Some(window) = web_sys::window()
+            && let Ok(hash) = window.location().hash()
+        {
+            apply_hash(&hash, bus);
         }
     }) as Box<dyn FnMut()>);
 
@@ -57,13 +57,13 @@ fn bind_panel_hover(document: &Document, bus: ShowcaseBus) {
 
     if let Ok(nodes) = document.query_selector_all(".demo__panel[id]") {
         for i in 0..nodes.length() {
-            if let Some(node) = nodes.item(i) {
-                if let Ok(el) = node.dyn_into::<Element>() {
-                    let _ = el.add_event_listener_with_callback(
-                        "pointerenter",
-                        on_panel_enter.as_ref().unchecked_ref(),
-                    );
-                }
+            if let Some(node) = nodes.item(i)
+                && let Ok(el) = node.dyn_into::<Element>()
+            {
+                let _ = el.add_event_listener_with_callback(
+                    "pointerenter",
+                    on_panel_enter.as_ref().unchecked_ref(),
+                );
             }
         }
     }
diff --git a/demo-leptos/src/showcase/sources.rs b/demo-leptos/src/showcase/sources.rs
index 6f0c379..d15f773 100644
--- a/demo-leptos/src/showcase/sources.rs
+++ b/demo-leptos/src/showcase/sources.rs
@@ -102,11 +102,7 @@ pub fn entry_for(panel_id: &str) -> Option<&'static ShowcaseEntry> {
 
 /// Default to the child template on io-parent (I/O bindings live there).
 pub fn default_file_index(panel_id: &str) -> usize {
-    if panel_id == "io-parent" {
-        3
-    } else {
-        0
-    }
+    if panel_id == "io-parent" { 3 } else { 0 }
 }
 
 pub fn source_for(
diff --git a/demo-tauri/src/Cargo.toml b/demo-tauri/src/Cargo.toml
index f9e2330..1697bd7 100644
--- a/demo-tauri/src/Cargo.toml
+++ b/demo-tauri/src/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rangular-demo-tauri"
 description = "Tauri shell for the rangular Leptos demo (CSR / wasm)"
 version = "1.0.2"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 publish = false
 rust-version = "1.88"