Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ resolver = "2"

[workspace.package]
authors = ["Rust For Web <info@rustforweb.org>"]
edition = "2021"
edition = "2024"
license = "MIT"
repository = "https://github.com/RustForWeb/dom"

Expand Down
2 changes: 1 addition & 1 deletion packages/aria-hidden/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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! {
Expand Down
2 changes: 1 addition & 1 deletion packages/aria-query/src/aria_props_map.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::{collections::HashMap, sync::LazyLock};

use crate::{
types::{AriaProperty, AriaPropertyDefinition},
AriaPropertyDefinitionType,
types::{AriaProperty, AriaPropertyDefinition},
};

pub static ARIA: LazyLock<HashMap<AriaProperty, AriaPropertyDefinition>> = LazyLock::new(|| {
Expand Down
2 changes: 1 addition & 1 deletion packages/aria-query/src/element_role_map.rs
Original file line number Diff line number Diff line change
@@ -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<HashMap<AriaRoleRelationConcept, Vec<AriaRoleDefinitionKey>>> =
LazyLock::new(|| {
Expand Down
2 changes: 1 addition & 1 deletion packages/aria-query/src/role_element_map.rs
Original file line number Diff line number Diff line change
@@ -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<HashMap<AriaRoleDefinitionKey, Vec<AriaRoleRelationConcept>>> =
LazyLock::new(|| {
Expand Down
4 changes: 2 additions & 2 deletions packages/aria-query/src/roles_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
2 changes: 1 addition & 1 deletion packages/dom-accessibility-api/src/accessible_name.rs
Original file line number Diff line number Diff line change
@@ -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,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion packages/dom-accessibility-api/src/get_role.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 2 additions & 2 deletions packages/dom-accessibility-api/src/util.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Loading