Skip to content

Commit 10dacb5

Browse files
chore: update to Rust edition 2024 (#14)
1 parent 7b5aaa2 commit 10dacb5

12 files changed

Lines changed: 30 additions & 30 deletions

File tree

Cargo.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ resolver = "2"
44

55
[workspace.package]
66
authors = ["Rust For Web <info@rustforweb.org>"]
7-
edition = "2021"
7+
edition = "2024"
88
license = "MIT"
99
repository = "https://github.com/RustForWeb/dom"
1010

packages/aria-hidden/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::{
77
sync::atomic::AtomicU64,
88
};
99

10-
use web_sys::{wasm_bindgen::JsCast, Element, HtmlElement, Node, NodeList, ShadowRoot};
10+
use web_sys::{Element, HtmlElement, Node, NodeList, ShadowRoot, wasm_bindgen::JsCast};
1111

1212
// Element is not Send and WebAssembly is single threaded, so this should be fine for now.
1313
thread_local! {

packages/aria-query/src/aria_props_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use std::{collections::HashMap, sync::LazyLock};
22

33
use crate::{
4-
types::{AriaProperty, AriaPropertyDefinition},
54
AriaPropertyDefinitionType,
5+
types::{AriaProperty, AriaPropertyDefinition},
66
};
77

88
pub static ARIA: LazyLock<HashMap<AriaProperty, AriaPropertyDefinition>> = LazyLock::new(|| {

packages/aria-query/src/element_role_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{collections::HashMap, sync::LazyLock};
22

3-
use crate::{roles_map::ROLES, types::AriaRoleDefinitionKey, AriaRoleRelationConcept};
3+
use crate::{AriaRoleRelationConcept, roles_map::ROLES, types::AriaRoleDefinitionKey};
44

55
pub static ELEMENT_ROLES: LazyLock<HashMap<AriaRoleRelationConcept, Vec<AriaRoleDefinitionKey>>> =
66
LazyLock::new(|| {

packages/aria-query/src/role_element_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{collections::HashMap, sync::LazyLock};
22

3-
use crate::{roles_map::ROLES, types::AriaRoleDefinitionKey, AriaRoleRelationConcept};
3+
use crate::{AriaRoleRelationConcept, roles_map::ROLES, types::AriaRoleDefinitionKey};
44

55
pub static ROLE_ELEMENTS: LazyLock<HashMap<AriaRoleDefinitionKey, Vec<AriaRoleRelationConcept>>> =
66
LazyLock::new(|| {

packages/aria-query/src/roles_map.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::{collections::HashMap, sync::LazyLock};
22

33
use crate::{
44
etc::roles::{
5-
dpub::ARIA_DPUB_ROLES, graphics::ARIA_GRAPHICS_ROLES, literal::ARIA_LITERAL_ROLES,
6-
r#abstract::ARIA_ABSTRACT_ROLES,
5+
r#abstract::ARIA_ABSTRACT_ROLES, dpub::ARIA_DPUB_ROLES, graphics::ARIA_GRAPHICS_ROLES,
6+
literal::ARIA_LITERAL_ROLES,
77
},
88
types::{AriaRoleDefinition, AriaRoleDefinitionKey, AriaRoleDefinitionSuperClass},
99
};

packages/dom-accessibility-api/src/accessible_description.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use web_sys::Element;
22

33
use crate::{
44
accessible_name_and_description::{
5-
compute_text_alternative, Compute, ComputeTextAlternativeOptions,
5+
Compute, ComputeTextAlternativeOptions, compute_text_alternative,
66
},
77
util::query_id_refs,
88
};

packages/dom-accessibility-api/src/accessible_name.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use web_sys::Element;
22

33
use crate::{
4-
accessible_name_and_description::{compute_text_alternative, ComputeTextAlternativeOptions},
4+
accessible_name_and_description::{ComputeTextAlternativeOptions, compute_text_alternative},
55
util::has_any_concrete_roles,
66
};
77

packages/dom-accessibility-api/src/accessible_name_and_description.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ use std::rc::Rc;
22

33
use regex::Regex;
44
use web_sys::{
5-
wasm_bindgen::JsCast, window, CssStyleDeclaration, Element, HtmlFieldSetElement,
6-
HtmlInputElement, HtmlLabelElement, HtmlLegendElement, HtmlOptGroupElement, HtmlSelectElement,
7-
HtmlSlotElement, HtmlTableCaptionElement, HtmlTableElement, HtmlTextAreaElement, Node,
8-
SvgElement, SvgTitleElement,
5+
CssStyleDeclaration, Element, HtmlFieldSetElement, HtmlInputElement, HtmlLabelElement,
6+
HtmlLegendElement, HtmlOptGroupElement, HtmlSelectElement, HtmlSlotElement,
7+
HtmlTableCaptionElement, HtmlTableElement, HtmlTextAreaElement, Node, SvgElement,
8+
SvgTitleElement, wasm_bindgen::JsCast, window,
99
};
1010

1111
use crate::util::{
12-
array_to_vec, has_any_concrete_roles, html_collection_to_vec, node_list_to_vec, query_id_refs,
13-
PRESENTATION_ROLES,
12+
PRESENTATION_ROLES, array_to_vec, has_any_concrete_roles, html_collection_to_vec,
13+
node_list_to_vec, query_id_refs,
1414
};
1515

1616
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]

0 commit comments

Comments
 (0)