chore: update to Rust edition 2024 (#511)

Author: DanielleHuisman

Cargo.lock

@@ -36,7 +36,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Rust For Web <info@rustforweb.org>"]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 repository = "https://github.com/RustForWeb/radix"
 version = "0.0.2"

Cargo.toml

@@ -8,168 +8,168 @@ pub fn App() -> Html {
 
     #[cfg(feature = "aspect-ratio")]
     {
-        use crate::aspect_ratio::{render, AspectRatioRoute};
+        use crate::aspect_ratio::{AspectRatioRoute, render};
         children.push(html! {
             <Switch<AspectRatioRoute> render={render} />
         });
     }
     #[cfg(feature = "avatar")]
     {
-        use crate::avatar::{render, AvatarRoute};
+        use crate::avatar::{AvatarRoute, render};
         children.push(html! {
             <Switch<AvatarRoute> render={render} />
         });
     }
     #[cfg(feature = "badge")]
     {
-        use crate::badge::{render, BadgeRoute};
+        use crate::badge::{BadgeRoute, render};
         children.push(html! {
             <Switch<BadgeRoute> render={render} />
         });
     }
     #[cfg(feature = "blockquote")]
     {
-        use crate::blockquote::{render, BlockquoteRoute};
+        use crate::blockquote::{BlockquoteRoute, render};
         children.push(html! {
             <Switch<BlockquoteRoute> render={render} />
         });
     }
     #[cfg(feature = "box")]
     {
-        use crate::r#box::{render, BoxRoute};
+        use crate::r#box::{BoxRoute, render};
         children.push(html! {
             <Switch<BoxRoute> render={render} />
         });
     }
     #[cfg(feature = "button")]
     {
-        use crate::button::{render, ButtonRoute};
+        use crate::button::{ButtonRoute, render};
         children.push(html! {
             <Switch<ButtonRoute> render={render} />
         });
     }
     #[cfg(feature = "callout")]
     {
-        use crate::callout::{render, CalloutRoute};
+        use crate::callout::{CalloutRoute, render};
         children.push(html! {
             <Switch<CalloutRoute> render={render} />
         });
     }
     #[cfg(feature = "card")]
     {
-        use crate::card::{render, CardRoute};
+        use crate::card::{CardRoute, render};
         children.push(html! {
             <Switch<CardRoute> render={render} />
         });
     }
     #[cfg(feature = "checkbox")]
     {
-        use crate::checkbox::{render, CheckboxRoute};
+        use crate::checkbox::{CheckboxRoute, render};
         children.push(html! {
             <Switch<CheckboxRoute> render={render} />
         });
     }
     #[cfg(feature = "code")]
     {
-        use crate::code::{render, CodeRoute};
+        use crate::code::{CodeRoute, render};
         children.push(html! {
             <Switch<CodeRoute> render={render} />
         });
     }
     #[cfg(feature = "container")]
     {
-        use crate::container::{render, ContainerRoute};
+        use crate::container::{ContainerRoute, render};
         children.push(html! {
             <Switch<ContainerRoute> render={render} />
         });
     }
     #[cfg(feature = "data-list")]
     {
-        use crate::data_list::{render, DataListRoute};
+        use crate::data_list::{DataListRoute, render};
         children.push(html! {
             <Switch<DataListRoute> render={render} />
         });
     }
     #[cfg(feature = "em")]
     {
-        use crate::em::{render, EmRoute};
+        use crate::em::{EmRoute, render};
         children.push(html! {
             <Switch<EmRoute> render={render} />
         });
     }
     #[cfg(feature = "flex")]
     {
-        use crate::flex::{render, FlexRoute};
+        use crate::flex::{FlexRoute, render};
         children.push(html! {
             <Switch<FlexRoute> render={render} />
         });
     }
     #[cfg(feature = "grid")]
     {
-        use crate::grid::{render, GridRoute};
+        use crate::grid::{GridRoute, render};
         children.push(html! {
             <Switch<GridRoute> render={render} />
         });
     }
     #[cfg(feature = "heading")]
     {
-        use crate::heading::{render, HeadingRoute};
+        use crate::heading::{HeadingRoute, render};
         children.push(html! {
             <Switch<HeadingRoute> render={render} />
         });
     }
     #[cfg(feature = "icon-button")]
     {
-        use crate::icon_button::{render, IconButtonRoute};
+        use crate::icon_button::{IconButtonRoute, render};
         children.push(html! {
             <Switch<IconButtonRoute> render={render} />
         });
     }
     #[cfg(feature = "inset")]
     {
-        use crate::inset::{render, InsetRoute};
+        use crate::inset::{InsetRoute, render};
         children.push(html! {
             <Switch<InsetRoute> render={render} />
         });
     }
     #[cfg(feature = "kbd")]
     {
-        use crate::kbd::{render, KbdRoute};
+        use crate::kbd::{KbdRoute, render};
         children.push(html! {
             <Switch<KbdRoute> render={render} />
         });
     }
     #[cfg(feature = "link")]
     {
-        use crate::link::{render, LinkRoute};
+        use crate::link::{LinkRoute, render};
         children.push(html! {
             <Switch<LinkRoute> render={render} />
         });
     }
     #[cfg(feature = "quote")]
     {
-        use crate::quote::{render, QuoteRoute};
+        use crate::quote::{QuoteRoute, render};
         children.push(html! {
             <Switch<QuoteRoute> render={render} />
         });
     }
     #[cfg(feature = "radio")]
     {
-        use crate::radio::{render, RadioRoute};
+        use crate::radio::{RadioRoute, render};
         children.push(html! {
             <Switch<RadioRoute> render={render} />
         });
     }
     #[cfg(feature = "section")]
     {
-        use crate::section::{render, SectionRoute};
+        use crate::section::{SectionRoute, render};
         children.push(html! {
             <Switch<SectionRoute> render={render} />
         });
     }
     #[cfg(feature = "select")]
     {
-        use crate::select::{render, SelectRoute};
+        use crate::select::{SelectRoute, render};
         children.push(html! {
             <div style="min-height: 300px;">
                 <Switch<SelectRoute> render={render} />
@@ -178,70 +178,70 @@ pub fn App() -> Html {
     }
     #[cfg(feature = "separator")]
     {
-        use crate::separator::{render, SeparatorRoute};
+        use crate::separator::{SeparatorRoute, render};
         children.push(html! {
             <Switch<SeparatorRoute> render={render} />
         });
     }
     #[cfg(feature = "skeleton")]
     {
-        use crate::skeleton::{render, SkeletonRoute};
+        use crate::skeleton::{SkeletonRoute, render};
         children.push(html! {
             <Switch<SkeletonRoute> render={render} />
         });
     }
     #[cfg(feature = "spinner")]
     {
-        use crate::spinner::{render, SpinnerRoute};
+        use crate::spinner::{SpinnerRoute, render};
         children.push(html! {
             <Switch<SpinnerRoute> render={render} />
         });
     }
     #[cfg(feature = "strong")]
     {
-        use crate::strong::{render, StrongRoute};
+        use crate::strong::{StrongRoute, render};
         children.push(html! {
             <Switch<StrongRoute> render={render} />
         });
     }
     #[cfg(feature = "switch")]
     {
-        use crate::switch::{render, SwitchRoute};
+        use crate::switch::{SwitchRoute, render};
         children.push(html! {
             <Switch<SwitchRoute> render={render} />
         });
     }
     #[cfg(feature = "table")]
     {
-        use crate::table::{render, TableRoute};
+        use crate::table::{TableRoute, render};
         children.push(html! {
             <Switch<TableRoute> render={render} />
         });
     }
     #[cfg(feature = "text")]
     {
-        use crate::text::{render, TextRoute};
+        use crate::text::{TextRoute, render};
         children.push(html! {
             <Switch<TextRoute> render={render} />
         });
     }
     #[cfg(feature = "text-area")]
     {
-        use crate::text_area::{render, TextAreaRoute};
+        use crate::text_area::{TextAreaRoute, render};
         children.push(html! {
             <Switch<TextAreaRoute> render={render} />
         });
     }
     #[cfg(feature = "text-field")]
     {
-        use crate::text_field::{render, TextFieldRoute};
+        use crate::text_field::{TextFieldRoute, render};
         children.push(html! {
             <Switch<TextFieldRoute> render={render} />
         });
     }
     #[cfg(feature = "tooltip")]
     {
-        use crate::tooltip::{render, TooltipRoute};
+        use crate::tooltip::{TooltipRoute, render};
         children.push(html! {
             <Switch<TooltipRoute> render={render} />
         });

book-examples/yew/themes/src/app.rs

@@ -38,8 +38,11 @@ pub fn DecorativeBox(props: &DecorativeBoxProps) -> Html {
             ("background-clip", "padding-box"),
             ("border", "1px solid var(--gray-a5)"),
             ("border-radius", "var(--radius-1)"),
-            ("background-image", "url(\"data:image/svg+xml,%3Csvg width='6' height='6' viewBox='0 0 6 6' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%239C92AC' fill-opacity='0.2' fill-rule='evenodd'%3E%3Cpath d='M5 0h1L0 6V5zM6 5v1H5z'/%3E%3C/g%3E%3C/svg%3E\")"),
-        ])
+            (
+                "background-image",
+                "url(\"data:image/svg+xml,%3Csvg width='6' height='6' viewBox='0 0 6 6' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='%239C92AC' fill-opacity='0.2' fill-rule='evenodd'%3E%3Cpath d='M5 0h1L0 6V5zM6 5v1H5z'/%3E%3C/g%3E%3C/svg%3E\")",
+            ),
+        ]),
     };
 
     if let Some(as_child) = props.as_child.as_ref() {

book-examples/yew/themes/src/decorative_box.rs

@@ -19,4 +19,4 @@ git-repository-url = "https://github.com/RustForWeb/radix"
 serve = true
 
 [rust]
-edition = "2021"
+edition = "2024"

book/book.toml

@@ -1,8 +1,7 @@
 use leptos::{
     attr::{
-        aria_hidden,
-        custom::{custom_attribute, CustomAttr},
-        AriaHidden, Attr, NextAttribute,
+        AriaHidden, Attr, NextAttribute, aria_hidden,
+        custom::{CustomAttr, custom_attribute},
     },
     prelude::*,
 };

packages/primitives/leptos/accessible-icon/src/accessible_icon.rs

@@ -1,5 +1,5 @@
 use leptos::{
-    attr::{custom::custom_attribute, NextAttribute},
+    attr::{NextAttribute, custom::custom_attribute},
     prelude::*,
     svg,
 };

packages/primitives/leptos/arrow/src/arrow.rs

@@ -1,7 +1,7 @@
 use std::sync::atomic::{AtomicU64, Ordering};
 
 use leptos::prelude::*;
-use web_sys::{wasm_bindgen::JsCast, Element, HtmlElement};
+use web_sys::{Element, HtmlElement, wasm_bindgen::JsCast};
 
 static COUNT: AtomicU64 = AtomicU64::new(0);
 

packages/primitives/leptos/focus-guards/src/focus_guards.rs

@@ -5,7 +5,7 @@ use leptos::{
     tachys::html::node_ref::NodeRefContainer,
     wasm_bindgen::JsCast,
 };
-use leptos_node_ref::{any_node_ref, AnyNodeRef};
+use leptos_node_ref::{AnyNodeRef, any_node_ref};
 use leptos_typed_fallback_show::TypedFallbackShow;
 
 #[component]

packages/primitives/leptos/primitive/src/primitive.rs

@@ -3,8 +3,8 @@ use std::sync::Arc;
 use leptos::{ev::KeyboardEvent, prelude::*};
 use send_wrapper::SendWrapper;
 use web_sys::{
-    wasm_bindgen::{closure::Closure, JsCast},
     AddEventListenerOptions, Document, EventListenerOptions,
+    wasm_bindgen::{JsCast, closure::Closure},
 };
 
 /// Listens for when the escape key is down.