diff --git a/Cargo.lock b/Cargo.lock index 206c82c..2477862 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,9 +25,9 @@ version = "0.0.4" [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "cfg-if" @@ -55,9 +55,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "memchr" @@ -73,18 +73,18 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -120,9 +120,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "syn" -version = "2.0.68" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -131,9 +131,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "wasm-bindgen" diff --git a/Cargo.toml b/Cargo.toml index a31abd0..0e4f118 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ resolver = "2" [workspace.package] authors = ["Rust For Web "] -edition = "2021" +edition = "2024" license = "MIT" repository = "https://github.com/RustForWeb/dom" diff --git a/packages/aria-hidden/src/lib.rs b/packages/aria-hidden/src/lib.rs index df1ab52..3154619 100644 --- a/packages/aria-hidden/src/lib.rs +++ b/packages/aria-hidden/src/lib.rs @@ -7,7 +7,7 @@ use std::{ sync::atomic::AtomicU64, }; -use web_sys::{wasm_bindgen::JsCast, Element, HtmlElement, Node, NodeList, ShadowRoot}; +use web_sys::{Element, HtmlElement, Node, NodeList, ShadowRoot, wasm_bindgen::JsCast}; // Element is not Send and WebAssembly is single threaded, so this should be fine for now. thread_local! { diff --git a/packages/aria-query/src/aria_props_map.rs b/packages/aria-query/src/aria_props_map.rs index 6246a16..e1ccb74 100644 --- a/packages/aria-query/src/aria_props_map.rs +++ b/packages/aria-query/src/aria_props_map.rs @@ -1,8 +1,8 @@ use std::{collections::HashMap, sync::LazyLock}; use crate::{ - types::{AriaProperty, AriaPropertyDefinition}, AriaPropertyDefinitionType, + types::{AriaProperty, AriaPropertyDefinition}, }; pub static ARIA: LazyLock> = LazyLock::new(|| { diff --git a/packages/aria-query/src/element_role_map.rs b/packages/aria-query/src/element_role_map.rs index 48ef1e4..8e9d9f5 100644 --- a/packages/aria-query/src/element_role_map.rs +++ b/packages/aria-query/src/element_role_map.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, sync::LazyLock}; -use crate::{roles_map::ROLES, types::AriaRoleDefinitionKey, AriaRoleRelationConcept}; +use crate::{AriaRoleRelationConcept, roles_map::ROLES, types::AriaRoleDefinitionKey}; pub static ELEMENT_ROLES: LazyLock>> = LazyLock::new(|| { diff --git a/packages/aria-query/src/role_element_map.rs b/packages/aria-query/src/role_element_map.rs index c962ca1..9d672f4 100644 --- a/packages/aria-query/src/role_element_map.rs +++ b/packages/aria-query/src/role_element_map.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, sync::LazyLock}; -use crate::{roles_map::ROLES, types::AriaRoleDefinitionKey, AriaRoleRelationConcept}; +use crate::{AriaRoleRelationConcept, roles_map::ROLES, types::AriaRoleDefinitionKey}; pub static ROLE_ELEMENTS: LazyLock>> = LazyLock::new(|| { diff --git a/packages/aria-query/src/roles_map.rs b/packages/aria-query/src/roles_map.rs index ecc747d..74a4c04 100644 --- a/packages/aria-query/src/roles_map.rs +++ b/packages/aria-query/src/roles_map.rs @@ -2,8 +2,8 @@ use std::{collections::HashMap, sync::LazyLock}; use crate::{ etc::roles::{ - dpub::ARIA_DPUB_ROLES, graphics::ARIA_GRAPHICS_ROLES, literal::ARIA_LITERAL_ROLES, - r#abstract::ARIA_ABSTRACT_ROLES, + r#abstract::ARIA_ABSTRACT_ROLES, dpub::ARIA_DPUB_ROLES, graphics::ARIA_GRAPHICS_ROLES, + literal::ARIA_LITERAL_ROLES, }, types::{AriaRoleDefinition, AriaRoleDefinitionKey, AriaRoleDefinitionSuperClass}, }; diff --git a/packages/dom-accessibility-api/src/accessible_description.rs b/packages/dom-accessibility-api/src/accessible_description.rs index 3ed8efb..7024817 100644 --- a/packages/dom-accessibility-api/src/accessible_description.rs +++ b/packages/dom-accessibility-api/src/accessible_description.rs @@ -2,7 +2,7 @@ use web_sys::Element; use crate::{ accessible_name_and_description::{ - compute_text_alternative, Compute, ComputeTextAlternativeOptions, + Compute, ComputeTextAlternativeOptions, compute_text_alternative, }, util::query_id_refs, }; diff --git a/packages/dom-accessibility-api/src/accessible_name.rs b/packages/dom-accessibility-api/src/accessible_name.rs index 41b829f..2ae8e73 100644 --- a/packages/dom-accessibility-api/src/accessible_name.rs +++ b/packages/dom-accessibility-api/src/accessible_name.rs @@ -1,7 +1,7 @@ use web_sys::Element; use crate::{ - accessible_name_and_description::{compute_text_alternative, ComputeTextAlternativeOptions}, + accessible_name_and_description::{ComputeTextAlternativeOptions, compute_text_alternative}, util::has_any_concrete_roles, }; diff --git a/packages/dom-accessibility-api/src/accessible_name_and_description.rs b/packages/dom-accessibility-api/src/accessible_name_and_description.rs index a918225..f77c871 100644 --- a/packages/dom-accessibility-api/src/accessible_name_and_description.rs +++ b/packages/dom-accessibility-api/src/accessible_name_and_description.rs @@ -2,15 +2,15 @@ use std::rc::Rc; use regex::Regex; use web_sys::{ - wasm_bindgen::JsCast, window, CssStyleDeclaration, Element, HtmlFieldSetElement, - HtmlInputElement, HtmlLabelElement, HtmlLegendElement, HtmlOptGroupElement, HtmlSelectElement, - HtmlSlotElement, HtmlTableCaptionElement, HtmlTableElement, HtmlTextAreaElement, Node, - SvgElement, SvgTitleElement, + CssStyleDeclaration, Element, HtmlFieldSetElement, HtmlInputElement, HtmlLabelElement, + HtmlLegendElement, HtmlOptGroupElement, HtmlSelectElement, HtmlSlotElement, + HtmlTableCaptionElement, HtmlTableElement, HtmlTextAreaElement, Node, SvgElement, + SvgTitleElement, wasm_bindgen::JsCast, window, }; use crate::util::{ - array_to_vec, has_any_concrete_roles, html_collection_to_vec, node_list_to_vec, query_id_refs, - PRESENTATION_ROLES, + PRESENTATION_ROLES, array_to_vec, has_any_concrete_roles, html_collection_to_vec, + node_list_to_vec, query_id_refs, }; #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] diff --git a/packages/dom-accessibility-api/src/get_role.rs b/packages/dom-accessibility-api/src/get_role.rs index 5e7709c..da8590d 100644 --- a/packages/dom-accessibility-api/src/get_role.rs +++ b/packages/dom-accessibility-api/src/get_role.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, sync::LazyLock}; -use web_sys::{wasm_bindgen::JsCast, Element, HtmlInputElement, HtmlSelectElement}; +use web_sys::{Element, HtmlInputElement, HtmlSelectElement, wasm_bindgen::JsCast}; use crate::util::PRESENTATION_ROLES; diff --git a/packages/dom-accessibility-api/src/util.rs b/packages/dom-accessibility-api/src/util.rs index 6c98d15..ea0b148 100644 --- a/packages/dom-accessibility-api/src/util.rs +++ b/packages/dom-accessibility-api/src/util.rs @@ -1,6 +1,6 @@ use web_sys::{ - js_sys::Array, wasm_bindgen::JsCast, Document, DocumentFragment, Element, HtmlCollection, Node, - NodeList, + Document, DocumentFragment, Element, HtmlCollection, Node, NodeList, js_sys::Array, + wasm_bindgen::JsCast, }; use crate::get_role::get_role;