diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e746ea59..f24b7552 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ When reporting an issue, in order to help the maintainers understand what the pr When making a code contribution to AccessKit, before opening your pull request please make sure that: -- your patch builds with AccessKit's minimal supported Rust version (currently Rust 1.77.2) +- your patch builds with AccessKit's minimal supported Rust version (currently Rust 1.85) - you added tests where applicable - you tested your modifications on all impacted platforms (see below) - you updated any relevant documentation diff --git a/Cargo.toml b/Cargo.toml index 52e5065d..bd2ef7af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ categories = ["gui"] edition = "2021" license = "MIT OR Apache-2.0" repository = "https://github.com/AccessKit/accesskit" -rust-version = "1.77.2" +rust-version = "1.85" [workspace.dependencies] hashbrown = { version = "0.16", default-features = false, features = ["default-hasher"] } diff --git a/common/Cargo.toml b/common/Cargo.toml index 76a08d3a..4a74030f 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -27,3 +27,4 @@ enumn = ["dep:enumn"] pyo3 = ["dep:pyo3"] serde = ["dep:serde", "enumn", "uuid/serde"] schemars = ["dep:schemars", "dep:serde_json", "serde", "schemars/uuid1"] + diff --git a/consumer/Cargo.toml b/consumer/Cargo.toml index 70690a12..74898cb2 100644 --- a/consumer/Cargo.toml +++ b/consumer/Cargo.toml @@ -14,3 +14,4 @@ rust-version.workspace = true [dependencies] accesskit = { version = "0.23.0", path = "../common" } hashbrown.workspace = true + diff --git a/consumer/src/node.rs b/consumer/src/node.rs index f2c91fab..42adc18f 100644 --- a/consumer/src/node.rs +++ b/consumer/src/node.rs @@ -773,7 +773,7 @@ impl<'a> Node<'a> { first_text_run .data() .value() - .map_or(true, |value| value.is_empty()) + .is_none_or(|value| value.is_empty()) && text_runs.next().is_none() } else { true diff --git a/platforms/android/Cargo.toml b/platforms/android/Cargo.toml index 7d83fa3f..28bd6116 100644 --- a/platforms/android/Cargo.toml +++ b/platforms/android/Cargo.toml @@ -19,4 +19,3 @@ accesskit = { version = "0.23.0", path = "../../common" } accesskit_consumer = { version = "0.33.1", path = "../../consumer" } jni = "0.21.1" log = "0.4.17" - diff --git a/platforms/atspi-common/Cargo.toml b/platforms/atspi-common/Cargo.toml index f58490fa..160558e3 100644 --- a/platforms/atspi-common/Cargo.toml +++ b/platforms/atspi-common/Cargo.toml @@ -20,4 +20,3 @@ accesskit_consumer = { version = "0.33.1", path = "../../consumer" } atspi-common = { version = "0.13", default-features = false } serde = "1.0" zvariant = { version = "5.4", default-features = false } - diff --git a/platforms/macos/Cargo.toml b/platforms/macos/Cargo.toml index 94e7c3d3..0cb23dd6 100644 --- a/platforms/macos/Cargo.toml +++ b/platforms/macos/Cargo.toml @@ -34,4 +34,3 @@ objc2-app-kit = { version = "0.2.0", features = [ "NSView", "NSWindow", ] } - diff --git a/platforms/unix/Cargo.toml b/platforms/unix/Cargo.toml index f658e310..517e06e2 100644 --- a/platforms/unix/Cargo.toml +++ b/platforms/unix/Cargo.toml @@ -36,4 +36,3 @@ tokio-stream = { version = "0.1.14", optional = true } version = "1.32.0" optional = true features = ["macros", "net", "rt", "sync", "time"] - diff --git a/platforms/windows/Cargo.toml b/platforms/windows/Cargo.toml index 748c5b41..8bf4cba4 100644 --- a/platforms/windows/Cargo.toml +++ b/platforms/windows/Cargo.toml @@ -42,4 +42,3 @@ once_cell = "1.13.0" parking_lot = "0.12.4" scopeguard = "1.1.0" winit = "0.30" - diff --git a/platforms/winit/Cargo.toml b/platforms/winit/Cargo.toml index 1000cf64..eaebb0e1 100644 --- a/platforms/winit/Cargo.toml +++ b/platforms/winit/Cargo.toml @@ -48,3 +48,4 @@ softbuffer = { version = "0.4.0", default-features = false, features = [ "wayland", "wayland-dlopen", ] } +