chore: update to Rust edition 2024 (#23)

DanielleHuisman · web-flow · commit 04622d465446 · 2025-04-05T12:54:42.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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/testing-library"
 version = "0.0.1"
diff --git a/book/book.toml b/book/book.toml
@@ -19,4 +19,4 @@ git-repository-url = "https://github.com/RustForWeb/testing-library"
 serve = true
 
 [rust]
-edition = "2021"
+edition = "2024"
diff --git a/packages/dom/src/get_queries_for_element.rs b/packages/dom/src/get_queries_for_element.rs
@@ -1,10 +1,10 @@
 use web_sys::HtmlElement;
 
 use crate::{
+    ByRoleMatcher, ByRoleOptions,
     error::QueryError,
     queries::*,
     types::{Matcher, MatcherOptions, SelectorMatcherOptions, WaitForOptions},
-    ByRoleMatcher, ByRoleOptions,
 };
 
 pub fn get_queries_for_element(element: HtmlElement) -> BoundFunctions {
diff --git a/packages/dom/src/helpers.rs b/packages/dom/src/helpers.rs
@@ -1,4 +1,4 @@
-use web_sys::{window, Document};
+use web_sys::{Document, window};
 
 pub fn get_document() -> Document {
     window()
diff --git a/packages/dom/src/matches.rs b/packages/dom/src/matches.rs
@@ -4,7 +4,7 @@ use regex::Regex;
 use web_sys::Element;
 
 use crate::{
-    error::QueryError, DefaultNormalizerOptions, Matcher, NormalizerFn, NormalizerOptions,
+    DefaultNormalizerOptions, Matcher, NormalizerFn, NormalizerOptions, error::QueryError,
 };
 
 pub fn fuzzy_matches(
diff --git a/packages/dom/src/queries/role.rs b/packages/dom/src/queries/role.rs
@@ -1,8 +1,8 @@
 use std::collections::HashSet;
 
-use aria_query::{AriaProperty, AriaRole, ROLES, ROLE_ELEMENTS};
+use aria_query::{AriaProperty, AriaRole, ROLE_ELEMENTS, ROLES};
 use dom_accessibility_api::{
-    compute_accessible_description, compute_accessible_name, ComputeTextAlternativeOptions,
+    ComputeTextAlternativeOptions, compute_accessible_description, compute_accessible_name,
 };
 use web_sys::HtmlElement;
 
diff --git a/packages/dom/src/query_helpers.rs b/packages/dom/src/query_helpers.rs
@@ -1,19 +1,24 @@
 use web_sys::{Element, HtmlElement};
 
 use crate::{
+    Matcher, MatcherOptions, NormalizerOptions,
     config::get_config,
     error::QueryError,
     matches::{fuzzy_matches, make_normalizer, matches},
     util::node_list_to_vec,
-    Matcher, MatcherOptions, NormalizerOptions,
 };
 
 pub fn get_element_error(message: Option<String>, container: Element) -> QueryError {
     (get_config().get_element_error)(message, container)
 }
 
 pub fn get_multiple_elements_found_error(message: String, container: Element) -> QueryError {
-    get_element_error(Some(format!("{message}\n\n(If this is intentional, then use the `*_all_by_*` variant of the query (like `query_all_by_text`, `get_all_by_text`, or `find_all_by_text`)).")), container)
+    get_element_error(
+        Some(format!(
+            "{message}\n\n(If this is intentional, then use the `*_all_by_*` variant of the query (like `query_all_by_text`, `get_all_by_text`, or `find_all_by_text`))."
+        )),
+        container,
+    )
 }
 
 pub fn query_all_by_attribute<M: Into<Matcher>>(
@@ -165,7 +170,7 @@ macro_rules! make_find_query {
 
 #[macro_export]
 macro_rules! wrap_single_query_with_suggestion {
-    ($query:ident, $query_by_all_name:expr, $variant:expr, $name:ident, $matcher_type:ty, $options_type:ty) => {
+    ($query:ident, $query_by_all_name:expr_2021, $variant:expr_2021, $name:ident, $matcher_type:ty, $options_type:ty) => {
         pub fn $name<M: Into<$matcher_type>>(
             container: &HtmlElement,
             matcher: M,
@@ -195,7 +200,7 @@ macro_rules! wrap_single_query_with_suggestion {
 
 #[macro_export]
 macro_rules! wrap_all_by_query_with_suggestion {
-    ($query:ident, $query_by_all_name:expr, $variant:expr, $name:ident, $matcher_type:ty, $options_type:ty) => {
+    ($query:ident, $query_by_all_name:expr_2021, $variant:expr_2021, $name:ident, $matcher_type:ty, $options_type:ty) => {
         pub fn $name<M: Into<$matcher_type>>(
             container: &HtmlElement,
             matcher: M,
diff --git a/packages/dom/src/role_helpers.rs b/packages/dom/src/role_helpers.rs
@@ -5,7 +5,7 @@ use aria_query::{
     ELEMENT_ROLES,
 };
 use dom_accessibility_api::{
-    compute_accessible_description, compute_accessible_name, ComputeTextAlternativeOptions,
+    ComputeTextAlternativeOptions, compute_accessible_description, compute_accessible_name,
 };
 use wasm_bindgen::JsCast;
 use web_sys::{Element, HtmlElement, HtmlInputElement, HtmlOptionElement};
diff --git a/packages/dom/src/suggestions.rs b/packages/dom/src/suggestions.rs
@@ -1,8 +1,8 @@
 use web_sys::HtmlElement;
 
 use crate::{
-    types::{Method, Suggestion, Variant},
     MatcherOptions,
+    types::{Method, Suggestion, Variant},
 };
 
 fn make_suggestion(
diff --git a/packages/dom/tests/config.rs b/packages/dom/tests/config.rs
@@ -1,6 +1,6 @@
 use std::sync::{Arc, LazyLock, Mutex, MutexGuard};
 
-use testing_library_dom::{configure, get_config, ConfigFnOrPartial, PartialConfig};
+use testing_library_dom::{ConfigFnOrPartial, PartialConfig, configure, get_config};
 
 static CONFIG_LOCK: Mutex<()> = Mutex::new(());
 static ORIGINAL_CONFIG: LazyLock<Arc<Mutex<PartialConfig>>> =
diff --git a/packages/dom/tests/element_queries.rs b/packages/dom/tests/element_queries.rs
@@ -6,11 +6,11 @@ use std::sync::{Arc, LazyLock, Mutex};
 
 use indoc::indoc;
 use testing_library_dom::{
-    configure, ConfigFnOrPartial, MatcherOptions, PartialConfig, QueryError, SelectorMatcherOptions,
+    ConfigFnOrPartial, MatcherOptions, PartialConfig, QueryError, SelectorMatcherOptions, configure,
 };
 use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
 
-use self::helpers::test_utils::{render, RenderReturn};
+use self::helpers::test_utils::{RenderReturn, render};
 
 wasm_bindgen_test_configure!(run_in_browser);
 
@@ -46,24 +46,36 @@ fn query_can_return_none() -> Result<(), QueryError> {
         container_queries, ..
     } = render("<div />", None);
 
-    assert!(container_queries
-        .query_by_test_id("LucyRicardo", MatcherOptions::default())?
-        .is_none());
-    assert!(container_queries
-        .query_by_label_text("LucyRicardo", SelectorMatcherOptions::default())?
-        .is_none());
-    assert!(container_queries
-        .query_by_display_value("LucyRicardo", MatcherOptions::default())?
-        .is_none());
-    assert!(container_queries
-        .query_by_placeholder_text("LucyRicardo", MatcherOptions::default())?
-        .is_none());
-    assert!(container_queries
-        .query_by_text("LucyRicardo", SelectorMatcherOptions::default())?
-        .is_none());
-    assert!(container_queries
-        .query_by_alt_text("LucyRicardo", MatcherOptions::default())?
-        .is_none());
+    assert!(
+        container_queries
+            .query_by_test_id("LucyRicardo", MatcherOptions::default())?
+            .is_none()
+    );
+    assert!(
+        container_queries
+            .query_by_label_text("LucyRicardo", SelectorMatcherOptions::default())?
+            .is_none()
+    );
+    assert!(
+        container_queries
+            .query_by_display_value("LucyRicardo", MatcherOptions::default())?
+            .is_none()
+    );
+    assert!(
+        container_queries
+            .query_by_placeholder_text("LucyRicardo", MatcherOptions::default())?
+            .is_none()
+    );
+    assert!(
+        container_queries
+            .query_by_text("LucyRicardo", SelectorMatcherOptions::default())?
+            .is_none()
+    );
+    assert!(
+        container_queries
+            .query_by_alt_text("LucyRicardo", MatcherOptions::default())?
+            .is_none()
+    );
 
     after_each();
 
@@ -76,7 +88,10 @@ fn get_throws_a_useful_error_message() -> Result<(), QueryError> {
 
     let RenderReturn {
         container_queries, ..
-    } = render("<div></div><!-- Ignored comment --><style type=\"text/css\">body {} </style><script type=\"text/javascript\"></script>", None);
+    } = render(
+        "<div></div><!-- Ignored comment --><style type=\"text/css\">body {} </style><script type=\"text/javascript\"></script>",
+        None,
+    );
 
     assert_eq!(
         Err(QueryError::Element(
diff --git a/packages/dom/tests/get_node_text.rs b/packages/dom/tests/get_node_text.rs
@@ -5,7 +5,7 @@ mod helpers;
 use testing_library_dom::get_node_text;
 use wasm_bindgen_test::{wasm_bindgen_test, wasm_bindgen_test_configure};
 
-use self::helpers::test_utils::{render, RenderReturn};
+use self::helpers::test_utils::{RenderReturn, render};
 
 wasm_bindgen_test_configure!(run_in_browser);
 
diff --git a/packages/dom/tests/helpers/test_utils.rs b/packages/dom/tests/helpers/test_utils.rs
@@ -1,9 +1,9 @@
 // TODO: remove
 #![allow(dead_code)]
 
-use testing_library_dom::{get_queries_for_element, BoundFunctions};
+use testing_library_dom::{BoundFunctions, get_queries_for_element};
 use wasm_bindgen::JsCast;
-use web_sys::{window, Document, Element, HtmlElement};
+use web_sys::{Document, Element, HtmlElement, window};
 
 pub fn document() -> Document {
     window()
diff --git a/packages/dom/tests/pretty_dom.rs b/packages/dom/tests/pretty_dom.rs
diff --git a/packages/dom/tests/query_helpers.rs b/packages/dom/tests/query_helpers.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-use web_sys::{window, Document};`
	`1`	`+use web_sys::{Document, window};`
`2`	`2`
`3`	`3`	`pub fn get_document() -> Document {`
`4`	`4`	`window()`