diff --git a/Cargo.lock b/Cargo.lock index 71a1426d6..0592868ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -906,9 +906,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -1017,7 +1017,7 @@ checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ "bitflags 2.4.1", "libc", - "redox_syscall 0.4.1", + "redox_syscall", ] [[package]] @@ -1026,16 +1026,6 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" -[[package]] -name = "lock_api" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" version = "0.4.17" @@ -1298,29 +1288,6 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "smallvec", - "windows-targets 0.48.1", -] - [[package]] name = "paste" version = "1.0.12" @@ -1396,6 +1363,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1422,15 +1395,16 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.20.1" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82ad98ce1991c9c70c3464ba4187337b9c45fcbbb060d46dca15f0c075e14e2" +checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc" dependencies = [ "cfg-if", "indoc", "libc", "memoffset 0.9.0", - "parking_lot", + "once_cell", + "portable-atomic", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -1439,9 +1413,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.20.1" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5503d0b3aee2c7a8dbb389cd87cd9649f675d4c7f60ca33699a3e3859d81a891" +checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7" dependencies = [ "once_cell", "target-lexicon", @@ -1449,9 +1423,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.20.1" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a79e8d80486a00d11c0dcb27cd2aa17c022cc95c677b461f01797226ba8f41" +checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d" dependencies = [ "libc", "pyo3-build-config", @@ -1459,9 +1433,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.20.1" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4b0dc7eaa578604fab11c8c7ff8934c71249c61d4def8e272c76ed879f03d4" +checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1471,12 +1445,13 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.20.1" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "816a4f709e29ddab2e3cdfe94600d554c5556cad0ddfeea95c47b580c3247fa4" +checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4" dependencies = [ "heck", "proc-macro2", + "pyo3-build-config", "quote", "syn", ] @@ -1542,15 +1517,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539" -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -1800,9 +1766,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" @@ -1812,7 +1778,7 @@ checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.4.1", + "redox_syscall", "rustix", "windows-sys 0.48.0", ] @@ -2547,7 +2513,7 @@ dependencies = [ "pin-project", "raw-window-handle 0.5.2", "raw-window-handle 0.6.2", - "redox_syscall 0.4.1", + "redox_syscall", "rustix", "sctk-adwaita", "smithay-client-toolkit", diff --git a/common/Cargo.toml b/common/Cargo.toml index 78ca24bc5..7be4fa326 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -16,7 +16,7 @@ features = ["schemars", "serde"] [dependencies] enumn = { version = "0.1.6", optional = true } -pyo3 = { version = "0.20", optional = true } +pyo3 = { version = "0.23", optional = true } schemars = { version = "0.8.7", optional = true } serde = { version = "1.0", default-features = false, features = ["alloc", "derive"], optional = true } diff --git a/common/src/lib.rs b/common/src/lib.rs index 68143a793..93b8e1675 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -49,7 +49,7 @@ pub use geometry::{Affine, Point, Rect, Size, Vec2}; #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum Role { @@ -275,7 +275,7 @@ pub enum Role { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum Action { @@ -402,7 +402,7 @@ fn action_mask_to_action_vec(mask: u32) -> Vec { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum Orientation { @@ -419,7 +419,7 @@ pub enum Orientation { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum TextDirection { @@ -440,7 +440,7 @@ pub enum TextDirection { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum Invalid { @@ -456,7 +456,7 @@ pub enum Invalid { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum Toggled { @@ -472,7 +472,7 @@ pub enum Toggled { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum SortDirection { @@ -488,7 +488,7 @@ pub enum SortDirection { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum AriaCurrent { @@ -508,7 +508,7 @@ pub enum AriaCurrent { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum AutoComplete { @@ -524,7 +524,7 @@ pub enum AutoComplete { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum Live { @@ -540,7 +540,7 @@ pub enum Live { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum HasPopup { @@ -559,7 +559,7 @@ pub enum HasPopup { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum ListStyle { @@ -579,7 +579,7 @@ pub enum ListStyle { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum TextAlign { @@ -596,7 +596,7 @@ pub enum TextAlign { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum VerticalOffset { @@ -611,7 +611,7 @@ pub enum VerticalOffset { #[cfg_attr(feature = "serde", serde(rename_all = "camelCase"))] #[cfg_attr( feature = "pyo3", - pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE") + pyclass(module = "accesskit", rename_all = "SCREAMING_SNAKE_CASE", eq) )] #[repr(u8)] pub enum TextDecoration {