refactor: Migrate to 2024 Rust edition

DataTriny · DataTriny · commit 2e3f09129a2d · 2026-04-19T20:29:02.000+02:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ default-members = [
 [workspace.package]
 authors = ["The AccessKit contributors"]
 categories = ["gui"]
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/AccessKit/accesskit"
 rust-version = "1.85"
diff --git a/common/src/lib.rs b/common/src/lib.rs
@@ -19,12 +19,12 @@ use core::fmt;
 #[cfg(feature = "pyo3")]
 use pyo3::pyclass;
 #[cfg(feature = "schemars")]
-use schemars::{json_schema, JsonSchema, Schema, SchemaGenerator};
+use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
 #[cfg(feature = "serde")]
 use serde::{
+    Deserialize, Serialize,
     de::{Deserializer, IgnoredAny, MapAccess, Visitor},
     ser::{SerializeMap, Serializer},
-    Deserialize, Serialize,
 };
 #[cfg(feature = "schemars")]
 use serde_json::{Map as SchemaMap, Value as SchemaValue};
@@ -2590,9 +2590,9 @@ impl JsonSchema for Properties {
         "Properties".into()
     }
 
-    fn json_schema(gen: &mut SchemaGenerator) -> Schema {
+    fn json_schema(generator: &mut SchemaGenerator) -> Schema {
         let mut properties = SchemaMap::<String, SchemaValue>::new();
-        add_properties_to_schema!(gen, properties, {
+        add_properties_to_schema!(generator, properties, {
             Vec<NodeId> {
                 Children,
                 Controls,
diff --git a/platforms/android/src/action.rs b/platforms/android/src/action.rs
@@ -3,7 +3,7 @@
 // the LICENSE-APACHE file) or the MIT license (found in
 // the LICENSE-MIT file), at your option.
 
-use jni::{objects::JObject, sys::jint, JNIEnv};
+use jni::{JNIEnv, objects::JObject, sys::jint};
 
 use crate::util::*;
 
diff --git a/platforms/android/src/adapter.rs b/platforms/android/src/adapter.rs
@@ -15,16 +15,16 @@ use accesskit::{
 };
 use accesskit_consumer::{FilterResult, Node, TextPosition, Tree, TreeChangeHandler};
 use jni::{
+    JNIEnv,
     objects::JObject,
     sys::{jfloat, jint},
-    JNIEnv,
 };
 
 use crate::{
     action::{PlatformAction, PlatformActionInner},
     event::{QueuedEvent, QueuedEvents, ScrollDimension},
     filters::filter,
-    node::{add_action, NodeWrapper},
+    node::{NodeWrapper, add_action},
     util::*,
 };
 
@@ -613,11 +613,7 @@ impl Adapter {
             self.set_text_selection_common(action_handler, &mut events, virtual_view_id, |node| {
                 let current = node.text_selection_focus().unwrap_or_else(|| {
                     let range = node.document_range();
-                    if forward {
-                        range.start()
-                    } else {
-                        range.end()
-                    }
+                    if forward { range.start() } else { range.end() }
                 });
                 if (forward && current.is_document_end())
                     || (!forward && current.is_document_start())
@@ -724,12 +720,10 @@ impl Adapter {
                 }
                 let focus = if forward { segment_end } else { segment_start };
                 let anchor = if extend_selection {
-                    node.text_selection_anchor().unwrap_or({
-                        if forward {
-                            segment_start
-                        } else {
-                            segment_end
-                        }
+                    node.text_selection_anchor().unwrap_or(if forward {
+                        segment_start
+                    } else {
+                        segment_end
                     })
                 } else {
                     focus
diff --git a/platforms/android/src/event.rs b/platforms/android/src/event.rs
@@ -8,7 +8,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE.chromium file.
 
-use jni::{objects::JObject, sys::jint, JNIEnv};
+use jni::{JNIEnv, objects::JObject, sys::jint};
 
 use crate::util::*;
 
diff --git a/platforms/android/src/inject.rs b/platforms/android/src/inject.rs
@@ -11,19 +11,19 @@
 
 use accesskit::{ActionHandler, ActivationHandler, TreeUpdate};
 use jni::{
+    JNIEnv, JavaVM, NativeMethod,
     errors::Result,
     objects::{GlobalRef, JClass, JObject, WeakRef},
-    sys::{jboolean, jfloat, jint, jlong, JNI_FALSE, JNI_TRUE},
-    JNIEnv, JavaVM, NativeMethod,
+    sys::{JNI_FALSE, JNI_TRUE, jboolean, jfloat, jint, jlong},
 };
 use log::debug;
 use std::{
     collections::BTreeMap,
     ffi::c_void,
     fmt::{Debug, Formatter},
     sync::{
-        atomic::{AtomicI64, Ordering},
         Arc, Mutex, OnceLock, Weak,
+        atomic::{AtomicI64, Ordering},
     },
 };
 
diff --git a/platforms/android/src/node.rs b/platforms/android/src/node.rs
@@ -10,7 +10,7 @@
 
 use accesskit::{Action, Live, Role, Toggled};
 use accesskit_consumer::Node;
-use jni::{objects::JObject, sys::jint, JNIEnv};
+use jni::{JNIEnv, objects::JObject, sys::jint};
 
 use crate::{filters::filter, util::*};
 
diff --git a/platforms/android/src/util.rs b/platforms/android/src/util.rs
@@ -4,7 +4,7 @@
 // the LICENSE-MIT file), at your option.
 
 use accesskit_consumer::{Node, NodeId};
-use jni::{objects::JObject, sys::jint, JNIEnv};
+use jni::{JNIEnv, objects::JObject, sys::jint};
 use std::collections::HashMap;
 
 pub(crate) const ACTION_FOCUS: jint = 1 << 0;
diff --git a/platforms/atspi-common/src/adapter.rs b/platforms/atspi-common/src/adapter.rs
@@ -9,11 +9,11 @@
 // found in the LICENSE.chromium file.
 
 use crate::{
+    AdapterCallback, Event, ObjectEvent, WindowEvent,
     context::{ActionHandlerNoMut, ActionHandlerWrapper, AppContext, Context},
     filters::filter,
     node::{NodeIdOrRoot, NodeWrapper, PlatformNode, PlatformRoot},
     util::WindowBounds,
-    AdapterCallback, Event, ObjectEvent, WindowEvent,
 };
 use accesskit::{ActionHandler, Role, TreeUpdate};
 use accesskit_consumer::{FilterResult, Node, NodeId, Tree, TreeChangeHandler, TreeState};
@@ -22,8 +22,8 @@ use std::fmt::{Debug, Formatter};
 use std::{
     collections::HashSet,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc, RwLock,
+        atomic::{AtomicUsize, Ordering},
     },
 };
 
diff --git a/platforms/atspi-common/src/lib.rs b/platforms/atspi-common/src/lib.rs
@@ -23,7 +23,7 @@ pub use atspi_common::{
 };
 
 pub use action::*;
-pub use adapter::{next_adapter_id, Adapter};
+pub use adapter::{Adapter, next_adapter_id};
 pub use callback::AdapterCallback;
 pub use context::{ActionHandlerNoMut, ActionHandlerWrapper, AppContext};
 pub use error::*;
diff --git a/platforms/atspi-common/src/node.rs b/platforms/atspi-common/src/node.rs
@@ -25,12 +25,12 @@ use std::{
 };
 
 use crate::{
+    Action as AtspiAction, Error, ObjectEvent, Property, Rect as AtspiRect, Result,
     adapter::Adapter,
     context::{AppContext, Context},
     filters::filter,
     text_attributes::ATTRIBUTE_GETTERS,
     util::*,
-    Action as AtspiAction, Error, ObjectEvent, Property, Rect as AtspiRect, Result,
 };
 
 pub(crate) struct NodeWrapper<'a>(pub(crate) &'a Node<'a>);
@@ -465,11 +465,7 @@ impl NodeWrapper<'_> {
     }
 
     fn n_actions(&self) -> i32 {
-        if self.0.is_clickable(&filter) {
-            1
-        } else {
-            0
-        }
+        if self.0.is_clickable(&filter) { 1 } else { 0 }
     }
 
     fn get_action_name(&self, index: i32) -> String {
diff --git a/platforms/macos/src/adapter.rs b/platforms/macos/src/adapter.rs
@@ -5,7 +5,7 @@
 
 use crate::{
     context::{ActionHandlerNoMut, ActionHandlerWrapper, Context},
-    event::{focus_event, EventGenerator, QueuedEvents},
+    event::{EventGenerator, QueuedEvents, focus_event},
     filters::filter,
     node::can_be_focused,
     util::*,
diff --git a/platforms/macos/src/node.rs b/platforms/macos/src/node.rs
@@ -15,17 +15,17 @@ use accesskit::{
 };
 use accesskit_consumer::{FilterResult, Node, NodeId, Tree};
 use objc2::{
-    declare_class, msg_send_id,
+    ClassType, DeclaredClass, declare_class, msg_send_id,
     mutability::InteriorMutable,
     rc::Id,
     runtime::{AnyObject, Sel},
-    sel, ClassType, DeclaredClass,
+    sel,
 };
 use objc2_app_kit::*;
 use objc2_foundation::{
-    ns_string, NSArray, NSAttributedString, NSCopying, NSInteger, NSMutableAttributedString,
+    NSArray, NSAttributedString, NSCopying, NSInteger, NSMutableAttributedString,
     NSMutableDictionary, NSNumber, NSObject, NSObjectProtocol, NSPoint, NSRange, NSRect, NSString,
-    NSURL,
+    NSURL, ns_string,
 };
 use std::rc::{Rc, Weak};
 
diff --git a/platforms/macos/src/patch.rs b/platforms/macos/src/patch.rs
@@ -4,11 +4,12 @@
 // the LICENSE-MIT file), at your option.
 
 use objc2::{
+    Message,
     encode::{Encode, EncodeArguments, EncodeReturn, Encoding},
     ffi::class_addMethod,
     msg_send,
     runtime::{AnyClass, AnyObject, Bool, MethodImplementation, Sel},
-    sel, Message,
+    sel,
 };
 use objc2_app_kit::NSWindow;
 use std::{ffi::CString, ptr::null_mut};
diff --git a/platforms/macos/src/subclass.rs b/platforms/macos/src/subclass.rs
@@ -5,23 +5,24 @@
 
 use accesskit::{ActionHandler, ActivationHandler, TreeUpdate};
 use objc2::{
+    ClassType, DeclaredClass,
     declare::ClassBuilder,
     declare_class,
     ffi::{
-        objc_getAssociatedObject, objc_setAssociatedObject, object_setClass,
-        OBJC_ASSOCIATION_RETAIN_NONATOMIC,
+        OBJC_ASSOCIATION_RETAIN_NONATOMIC, objc_getAssociatedObject, objc_setAssociatedObject,
+        object_setClass,
     },
     msg_send_id,
     mutability::InteriorMutable,
     rc::Id,
     runtime::{AnyClass, Sel},
-    sel, ClassType, DeclaredClass,
+    sel,
 };
 use objc2_app_kit::{NSView, NSWindow};
 use objc2_foundation::{NSArray, NSObject, NSPoint};
 use std::{cell::RefCell, ffi::c_void, sync::Mutex};
 
-use crate::{event::QueuedEvents, Adapter};
+use crate::{Adapter, event::QueuedEvents};
 
 static SUBCLASSES: Mutex<Vec<(&'static AnyClass, &'static AnyClass)>> = Mutex::new(Vec::new());
 
diff --git a/platforms/unix/src/adapter.rs b/platforms/unix/src/adapter.rs
@@ -5,8 +5,8 @@
 
 use accesskit::{ActionHandler, ActivationHandler, DeactivationHandler, Rect, TreeUpdate};
 use accesskit_atspi_common::{
-    next_adapter_id, ActionHandlerNoMut, ActionHandlerWrapper, Adapter as AdapterImpl,
-    AdapterCallback, Event, NodeId, PlatformNode, WindowBounds,
+    ActionHandlerNoMut, ActionHandlerWrapper, Adapter as AdapterImpl, AdapterCallback, Event,
+    NodeId, PlatformNode, WindowBounds, next_adapter_id,
 };
 #[cfg(not(feature = "tokio"))]
 use async_channel::Sender;
diff --git a/platforms/unix/src/atspi/bus.rs b/platforms/unix/src/atspi/bus.rs
@@ -4,24 +4,24 @@
 // the LICENSE-MIT file), at your option.
 
 use crate::{
-    atspi::{interfaces::*, ObjectId},
+    atspi::{ObjectId, interfaces::*},
     context::get_or_init_app_context,
     executor::{Executor, Task},
 };
 use accesskit_atspi_common::{
     NodeId, NodeIdOrRoot, ObjectEvent, PlatformNode, PlatformRoot, Property, WindowEvent,
 };
 use atspi::{
+    Interface, InterfaceSet,
     events::EventBodyBorrowed,
     proxy::{bus::BusProxy, socket::SocketProxy},
-    Interface, InterfaceSet,
 };
 use std::{env::var, io};
 use zbus::{
+    Address, Connection, Result,
     connection::Builder,
     names::{BusName, InterfaceName, MemberName, OwnedUniqueName},
     zvariant::{Str, Value},
-    Address, Connection, Result,
 };
 
 pub(crate) struct Bus {
diff --git a/platforms/unix/src/context.rs b/platforms/unix/src/context.rs
@@ -9,7 +9,7 @@ use accesskit_atspi_common::{Adapter as AdapterImpl, AppContext, Event};
 use async_channel::{Receiver, Sender};
 use atspi::proxy::bus::StatusProxy;
 #[cfg(not(feature = "tokio"))]
-use futures_util::{pin_mut as pin, select, StreamExt};
+use futures_util::{StreamExt, pin_mut as pin, select};
 use std::{
     sync::{Arc, Mutex, OnceLock, RwLock},
     thread,
@@ -20,12 +20,12 @@ use tokio::{
     sync::mpsc::{UnboundedReceiver as Receiver, UnboundedSender as Sender},
 };
 #[cfg(feature = "tokio")]
-use tokio_stream::{wrappers::UnboundedReceiverStream, StreamExt};
-use zbus::{connection::Builder, Connection};
+use tokio_stream::{StreamExt, wrappers::UnboundedReceiverStream};
+use zbus::{Connection, connection::Builder};
 
 use crate::{
     adapter::{AdapterState, Callback, Message},
-    atspi::{map_or_ignoring_broken_pipe, Bus},
+    atspi::{Bus, map_or_ignoring_broken_pipe},
     executor::Executor,
     util::block_on,
 };
diff --git a/platforms/winit/examples/mixed_handlers.rs b/platforms/winit/examples/mixed_handlers.rs
@@ -303,9 +303,13 @@ impl ApplicationHandler<AccessKitEvent> for Application {
 fn main() -> Result<(), Box<dyn Error>> {
     println!("This example has no visible GUI, and a keyboard interface:");
     println!("- [Tab] switches focus between two logical buttons.");
-    println!("- [Space] 'presses' the button, adding static text in a live region announcing that it was pressed.");
+    println!(
+        "- [Space] 'presses' the button, adding static text in a live region announcing that it was pressed."
+    );
     #[cfg(target_os = "windows")]
-    println!("Enable Narrator with [Win]+[Ctrl]+[Enter] (or [Win]+[Enter] on older versions of Windows).");
+    println!(
+        "Enable Narrator with [Win]+[Ctrl]+[Enter] (or [Win]+[Enter] on older versions of Windows)."
+    );
     #[cfg(all(
         feature = "accesskit_unix",
         any(
diff --git a/platforms/winit/examples/simple.rs b/platforms/winit/examples/simple.rs
@@ -278,9 +278,13 @@ impl ApplicationHandler<AccessKitEvent> for Application {
 fn main() -> Result<(), Box<dyn Error>> {
     println!("This example has no visible GUI, and a keyboard interface:");
     println!("- [Tab] switches focus between two logical buttons.");
-    println!("- [Space] 'presses' the button, adding static text in a live region announcing that it was pressed.");
+    println!(
+        "- [Space] 'presses' the button, adding static text in a live region announcing that it was pressed."
+    );
     #[cfg(target_os = "windows")]
-    println!("Enable Narrator with [Win]+[Ctrl]+[Enter] (or [Win]+[Enter] on older versions of Windows).");
+    println!(
+        "Enable Narrator with [Win]+[Ctrl]+[Enter] (or [Win]+[Enter] on older versions of Windows)."
+    );
     #[cfg(all(
         feature = "accesskit_unix",
         any(
diff --git a/platforms/winit/src/lib.rs b/platforms/winit/src/lib.rs
@@ -195,7 +195,9 @@ impl Adapter {
         deactivation_handler: impl 'static + DeactivationHandler + Send,
     ) -> Self {
         if window.is_visible() == Some(true) {
-            panic!("The AccessKit winit adapter must be created before the window is shown (made visible) for the first time.");
+            panic!(
+                "The AccessKit winit adapter must be created before the window is shown (made visible) for the first time."
+            );
         }
 
         let inner = platform_impl::Adapter::new(
diff --git a/platforms/winit/src/platform_impl/android.rs b/platforms/winit/src/platform_impl/android.rs
@@ -4,8 +4,8 @@
 
 use accesskit::{ActionHandler, ActivationHandler, DeactivationHandler, TreeUpdate};
 use accesskit_android::{
-    jni::{objects::JObject, JavaVM},
     InjectingAdapter,
+    jni::{JavaVM, objects::JObject},
 };
 use winit::{
     event::WindowEvent, event_loop::ActiveEventLoop, platform::android::ActiveEventLoopExtAndroid,
diff --git a/platforms/winit/src/platform_impl/windows.rs b/platforms/winit/src/platform_impl/windows.rs
